Skip to content

Commit d74a12b

Browse files
committed
Use absolute imports
Use absolute imports consistently throughout the package
1 parent 38b2fbb commit d74a12b

File tree

5 files changed

+40
-23
lines changed

5 files changed

+40
-23
lines changed

ciscosparkapi/__init__.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88

99
import os
1010

11-
from .exceptions import ciscosparkapiException, SparkApiError
12-
from .restsession import RestSession
13-
from .api.people import Person, PeopleAPI
14-
from .api.rooms import Room, RoomsAPI
15-
from .api.memberships import Membership, MembershipsAPI
16-
from .api.messages import Message, MessagesAPI
17-
from .api.teams import Team, TeamsAPI
18-
from .api.teammemberships import TeamMembership, TeamMembershipsAPI
19-
from .api.webhooks import Webhook, WebhooksAPI
20-
from .api.organizations import Organization, OrganizationsAPI
21-
from .api.licenses import License, LicensesAPI
22-
from .api.roles import Role, RolesAPI
23-
from .api.accesstokens import AccessToken, AccessTokensAPI
11+
from ciscosparkapi.exceptions import ciscosparkapiException, SparkApiError
12+
from ciscosparkapi.restsession import RestSession
13+
from ciscosparkapi.api.people import Person, PeopleAPI
14+
from ciscosparkapi.api.rooms import Room, RoomsAPI
15+
from ciscosparkapi.api.memberships import Membership, MembershipsAPI
16+
from ciscosparkapi.api.messages import Message, MessagesAPI
17+
from ciscosparkapi.api.teams import Team, TeamsAPI
18+
from ciscosparkapi.api.teammemberships import TeamMembership, TeamMembershipsAPI
19+
from ciscosparkapi.api.webhooks import Webhook, WebhooksAPI
20+
from ciscosparkapi.api.organizations import Organization, OrganizationsAPI
21+
from ciscosparkapi.api.licenses import License, LicensesAPI
22+
from ciscosparkapi.api.roles import Role, RolesAPI
23+
from ciscosparkapi.api.accesstokens import AccessToken, AccessTokensAPI
2424

2525

2626
__author__ = "Chris Lunsford"

ciscosparkapi/api/accesstokens.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919

2020
import requests
2121

22-
from ciscosparkapi.utils import ERC, validate_base_url, \
23-
check_response_code, extract_and_parse_json
2422
from ciscosparkapi.sparkdata import SparkData
23+
from ciscosparkapi.utils import (
24+
ERC,
25+
validate_base_url,
26+
check_response_code,
27+
extract_and_parse_json,
28+
)
2529

2630

2731
__author__ = "Chris Lunsford"

ciscosparkapi/api/messages.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
from requests_toolbelt import MultipartEncoder
1616

1717
from ciscosparkapi.exceptions import ciscosparkapiException
18-
from ciscosparkapi.utils import generator_container, is_web_url, \
19-
is_local_file, open_local_file
2018
from ciscosparkapi.restsession import RestSession
2119
from ciscosparkapi.sparkdata import SparkData
20+
from ciscosparkapi.utils import (
21+
generator_container,
22+
is_web_url,
23+
is_local_file,
24+
open_local_file,
25+
)
2226

2327

2428
__author__ = "Chris Lunsford"

ciscosparkapi/restsession.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33

44

55
from future import standard_library
6-
standard_library.install_aliases()
76
from builtins import object
87
from six import string_types
98

109
import urllib.parse
1110

1211
import requests
1312

14-
from .exceptions import ciscosparkapiException
15-
from .utils import ERC, validate_base_url, \
16-
raise_if_extra_kwargs, check_response_code, extract_and_parse_json
13+
from ciscosparkapi.exceptions import ciscosparkapiException
14+
from ciscosparkapi.utils import (
15+
ERC,
16+
validate_base_url,
17+
raise_if_extra_kwargs,
18+
check_response_code,
19+
extract_and_parse_json,
20+
)
1721

22+
# TODO: See if there is a better way to do this:
23+
standard_library.install_aliases()
1824

1925
__author__ = "Chris Lunsford"
2026
__author_email__ = "[email protected]"

ciscosparkapi/utils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44

55
from future import standard_library
6-
standard_library.install_aliases()
76
from builtins import object
87
from six import string_types
98

@@ -13,7 +12,11 @@
1312
import os
1413
import urllib.parse
1514

16-
from ciscosparkapi import ciscosparkapiException, SparkApiError
15+
from ciscosparkapi.exceptions import ciscosparkapiException, SparkApiError
16+
17+
18+
# TODO: See if there is a better way to do this:
19+
standard_library.install_aliases()
1720

1821

1922
__author__ = "Chris Lunsford"

0 commit comments

Comments
 (0)