Skip to content

Commit d518131

Browse files
committed
Futurize Stage2
futurize --stage2 --unicode-literals -w *.py
1 parent 85ca02e commit d518131

File tree

14 files changed

+53
-15
lines changed

14 files changed

+53
-15
lines changed

ciscosparkapi/__init__.py

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

44
from __future__ import absolute_import
55
from __future__ import unicode_literals
6+
from past.builtins import basestring
7+
from builtins import object
68

79
# Versioneer version control
810
from ._version import get_versions

ciscosparkapi/_version.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"""Git implementation of _version.py."""
1212
from __future__ import print_function
1313
from __future__ import unicode_literals
14+
from builtins import str
15+
from builtins import object
1416

1517
import errno
1618
import os
@@ -31,7 +33,7 @@ def get_keywords():
3133
return keywords
3234

3335

34-
class VersioneerConfig:
36+
class VersioneerConfig(object):
3537
"""Container for Versioneer configuration parameters."""
3638

3739

ciscosparkapi/api/accesstokens.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010

1111

1212
from __future__ import unicode_literals
13+
from future import standard_library
14+
standard_library.install_aliases()
15+
from past.builtins import basestring
16+
from builtins import object
1317

14-
import urlparse
18+
import urllib.parse
1519

1620
import requests
1721

@@ -83,7 +87,7 @@ def __init__(self, base_url, timeout=None):
8387
super(AccessTokensAPI, self).__init__()
8488
self._base_url = validate_base_url(base_url)
8589
self._timeout = timeout
86-
self._endpoint_url = urlparse.urljoin(self.base_url, API_ENDPOINT)
90+
self._endpoint_url = urllib.parse.urljoin(self.base_url, API_ENDPOINT)
8791
self._request_kwargs = {}
8892
self._request_kwargs[u"timeout"] = timeout
8993

ciscosparkapi/api/memberships.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111

1212
from __future__ import unicode_literals
13+
from past.builtins import basestring
14+
from builtins import object
1315

1416
from ciscosparkapi.exceptions import ciscosparkapiException
1517
from ciscosparkapi.helper import utf8, generator_container

ciscosparkapi/api/messages.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010

1111
from __future__ import unicode_literals
12+
from builtins import map
13+
from past.builtins import basestring
14+
from builtins import object
1215

1316
from ciscosparkapi.exceptions import ciscosparkapiException
1417
from ciscosparkapi.helper import utf8, generator_container
@@ -238,7 +241,7 @@ def create(self, roomId=None, toPersonId=None, toPersonEmail=None,
238241
if markdown:
239242
post_data[u'markdown'] = utf8(markdown)
240243
if files:
241-
files = map(utf8, files)
244+
files = list(map(utf8, files))
242245
post_data[u'files'] = files
243246
# API request
244247
json_obj = self.session.post('messages', json=post_data)

ciscosparkapi/api/people.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
from __future__ import unicode_literals
12+
from past.builtins import basestring
13+
from builtins import object
1214

1315
from ciscosparkapi.exceptions import ciscosparkapiException
1416
from ciscosparkapi.helper import utf8, generator_container

ciscosparkapi/api/rooms.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
from __future__ import unicode_literals
12+
from past.builtins import basestring
13+
from builtins import object
1214

1315
from ciscosparkapi.exceptions import ciscosparkapiException
1416
from ciscosparkapi.helper import utf8, generator_container

ciscosparkapi/api/teammemberships.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111

1212
from __future__ import unicode_literals
13+
from past.builtins import basestring
14+
from builtins import object
1315

1416
from ciscosparkapi.exceptions import ciscosparkapiException
1517
from ciscosparkapi.helper import utf8, generator_container

ciscosparkapi/api/teams.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
from __future__ import unicode_literals
12+
from past.builtins import basestring
13+
from builtins import object
1214

1315
from ciscosparkapi.exceptions import ciscosparkapiException
1416
from ciscosparkapi.helper import utf8, generator_container

ciscosparkapi/api/webhooks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
from __future__ import unicode_literals
12+
from past.builtins import basestring
13+
from builtins import object
1214

1315
from ciscosparkapi.exceptions import ciscosparkapiException
1416
from ciscosparkapi.helper import utf8, generator_container

0 commit comments

Comments
 (0)