diff options
Diffstat (limited to 'common/src/leap/soledad/common/l2db/remote')
3 files changed, 7 insertions, 8 deletions
diff --git a/common/src/leap/soledad/common/l2db/remote/http_app.py b/common/src/leap/soledad/common/l2db/remote/http_app.py index 496274b2..a4eddb36 100644 --- a/common/src/leap/soledad/common/l2db/remote/http_app.py +++ b/common/src/leap/soledad/common/l2db/remote/http_app.py @@ -21,11 +21,11 @@ HTTP Application exposing U1DB. # TODO -- deprecate, use twisted/txaio. import functools -import httplib +import six.moves.http_client as httplib import inspect import json import sys -import urlparse +import six.moves.urllib.parse as urlparse import routes.mapper @@ -610,7 +610,7 @@ class HTTPApp(object): try: resource = self._lookup_resource(environ, responder) HTTPInvocationByMethodWithBody(resource, environ, self)() - except errors.U1DBError, e: + except errors.U1DBError as e: self.request_u1db_error(environ, e) status = http_errors.wire_description_to_status.get( e.wire_description, 500) diff --git a/common/src/leap/soledad/common/l2db/remote/http_client.py b/common/src/leap/soledad/common/l2db/remote/http_client.py index 53363c0a..1124b038 100644 --- a/common/src/leap/soledad/common/l2db/remote/http_client.py +++ b/common/src/leap/soledad/common/l2db/remote/http_client.py @@ -16,14 +16,13 @@ """Base class to make requests to a remote HTTP server.""" -import httplib import json import socket import ssl import sys -import urlparse import urllib - +import six.moves.urllib.parse as urlparse +import six.moves.http_client as httplib from time import sleep from leap.soledad.common.l2db import errors from leap.soledad.common.l2db.remote import http_errors @@ -168,7 +167,7 @@ class HTTPClientBase(object): try: self._conn.request(method, url_query, body, headers) return self._response() - except errors.Unavailable, e: + except errors.Unavailable as e: sleep(delay) raise e diff --git a/common/src/leap/soledad/common/l2db/remote/http_database.py b/common/src/leap/soledad/common/l2db/remote/http_database.py index 7512379f..7e61e5a4 100644 --- a/common/src/leap/soledad/common/l2db/remote/http_database.py +++ b/common/src/leap/soledad/common/l2db/remote/http_database.py @@ -87,7 +87,7 @@ class HTTPDatabase(http_client.HTTPClientBase, Database): 'GET', ['doc', doc_id], {"include_deleted": include_deleted}) except errors.DocumentDoesNotExist: return None - except errors.HTTPError, e: + except errors.HTTPError as e: if (e.status == DOCUMENT_DELETED_STATUS and 'x-u1db-rev' in e.headers): res = None |