Browse Source

Merged in illess/python-keycloak (pull request #17)

Master

Approved-by: Marcos Pereira <marcospereira.mpj@gmail.com>
hotfix/merge
Illes 6 years ago
committed by Marcos Pereira
parent
commit
193a7ca686
  1. 1
      docs/source/index.rst
  2. 3
      keycloak/exceptions.py
  3. 1
      requirements.txt
  4. 3
      setup.py

1
docs/source/index.rst

@ -43,7 +43,6 @@ python-keycloak depends on:
* Python 3 * Python 3
* `requests <http://docs.python-requests.org/en/master/>`_ * `requests <http://docs.python-requests.org/en/master/>`_
* `python-jose <http://python-jose.readthedocs.io/en/latest/>`_ * `python-jose <http://python-jose.readthedocs.io/en/latest/>`_
* `simplejson <https://simplejson.readthedocs.io/en/latest/>`_
Tests Dependencies Tests Dependencies
------------------ ------------------

3
keycloak/exceptions.py

@ -22,7 +22,6 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import requests import requests
from simplejson import JSONDecodeError
class KeycloakError(Exception): class KeycloakError(Exception):
@ -82,7 +81,7 @@ def raise_error_from_response(response, error, expected_code=200, skip_exists=Fa
try: try:
return response.json() return response.json()
except JSONDecodeError as e:
except ValueError:
return response.content return response.content
if skip_exists and response.status_code == 409: if skip_exists and response.status_code == 409:

1
requirements.txt

@ -1,4 +1,3 @@
requests>=2.18.4 requests>=2.18.4
httmock>=1.2.5 httmock>=1.2.5
python-jose>=1.4.0 python-jose>=1.4.0
simplejson

3
setup.py

@ -17,7 +17,8 @@ setup(
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
packages=['keycloak', 'keycloak.authorization', 'keycloak.tests'], packages=['keycloak', 'keycloak.authorization', 'keycloak.tests'],
install_requires=['requests==2.18.4', 'httmock==1.2.5', 'python-jose==1.4.0', 'simplejson'],
install_requires=['requests==2.18.4', 'python-jose==1.4.0'],
tests_require=['httmock==1.2.5'],
classifiers=[ classifiers=[
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',

Loading…
Cancel
Save