summaryrefslogtreecommitdiff
path: root/macaroonbakery/httpbakery/__init__.py
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-12-12 15:20:49 +0000
committerColin Watson <cjwatson@debian.org>2018-02-05 15:58:12 +0000
commit533dfe1ab9feb21173bd3a1825a5f2afd95801a8 (patch)
treeed0fb92dc1429422669e5bbc10c66cc84efae321 /macaroonbakery/httpbakery/__init__.py
parentefd539f35f910d375a8b3eac5c66be048c5a02b6 (diff)
parent00ab469a4ae426c346228bd68eabe0fd4e689e4c (diff)
New upstream release (1.1.0)
Diffstat (limited to 'macaroonbakery/httpbakery/__init__.py')
-rw-r--r--macaroonbakery/httpbakery/__init__.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/macaroonbakery/httpbakery/__init__.py b/macaroonbakery/httpbakery/__init__.py
index 3f183c5..07a805b 100644
--- a/macaroonbakery/httpbakery/__init__.py
+++ b/macaroonbakery/httpbakery/__init__.py
@@ -1,11 +1,11 @@
# Copyright 2017 Canonical Ltd.
# Licensed under the LGPLv3, see LICENCE file for details.
-from macaroonbakery.httpbakery.client import (
+from ._client import (
BakeryException,
Client,
extract_macaroons,
)
-from macaroonbakery.httpbakery.error import (
+from ._error import (
BAKERY_PROTOCOL_HEADER,
DischargeError,
ERR_DISCHARGE_REQUIRED,
@@ -17,18 +17,18 @@ from macaroonbakery.httpbakery.error import (
discharge_required_response,
request_version,
)
-from macaroonbakery.httpbakery.keyring import ThirdPartyLocator
-from macaroonbakery.httpbakery.interactor import (
+from ._keyring import ThirdPartyLocator
+from ._interactor import (
DischargeToken,
Interactor,
LegacyInteractor,
WEB_BROWSER_INTERACTION_KIND,
)
-from macaroonbakery.httpbakery.browser import (
+from ._browser import (
WebBrowserInteractionInfo,
WebBrowserInteractor,
)
-from macaroonbakery.httpbakery.discharge import discharge
+from ._discharge import discharge
__all__ = [
'BAKERY_PROTOCOL_HEADER',