diff --git a/demo/auth.py b/demo/auth.py index 92b0227c..c2d06724 100644 --- a/demo/auth.py +++ b/demo/auth.py @@ -18,7 +18,7 @@ def authenticate(oauth_class=OAuth2): class StoppableWSGIServer(bottle.ServerAdapter): def __init__(self, *args, **kwargs): - super(StoppableWSGIServer, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._server = None def run(self, app): diff --git a/demo/example.py b/demo/example.py index 95318ef8..1f53eb57 100644 --- a/demo/example.py +++ b/demo/example.py @@ -5,7 +5,7 @@ from boxsdk import Client from boxsdk.exception import BoxAPIException from boxsdk.object.collaboration import CollaborationRole -from auth import authenticate +from demo.auth import authenticate def run_user_example(client): @@ -294,5 +294,6 @@ def main(): run_examples(oauth) os._exit(0) + if __name__ == '__main__': main() diff --git a/demo/music_player.py b/demo/music_player.py index 1ba9379a..44e48e45 100644 --- a/demo/music_player.py +++ b/demo/music_player.py @@ -8,7 +8,7 @@ from demo.auth import authenticate -class MusicPlayer(object): +class MusicPlayer: def __init__(self, folder_path): self._folder_path = folder_path self._client = self._get_client() @@ -31,7 +31,7 @@ def play(self): temp_file = tempfile.NamedTemporaryFile() temp_file.write(item.content()) item_with_name = item.get() - print item_with_name.name + print(item_with_name.name) subprocess.check_call(['afplay', temp_file.name]) diff --git a/test/functional/mock_box/behavior/event_behavior.py b/test/functional/mock_box/behavior/event_behavior.py index 3dc60f3d..1c91a34e 100644 --- a/test/functional/mock_box/behavior/event_behavior.py +++ b/test/functional/mock_box/behavior/event_behavior.py @@ -14,7 +14,7 @@ from test.functional.mock_box.util import json_utils as json -class EventBehavior(object): +class EventBehavior: def __init__(self, db_session): self._db_session = db_session self._subscribe_event = Event() diff --git a/test/functional/mock_box/behavior/item_behavior.py b/test/functional/mock_box/behavior/item_behavior.py index d8e8d227..0a29f7d0 100644 --- a/test/functional/mock_box/behavior/item_behavior.py +++ b/test/functional/mock_box/behavior/item_behavior.py @@ -7,7 +7,7 @@ from test.functional.mock_box.util import json_utils as json -class ItemBehavior(object): +class ItemBehavior: def __init__(self, db_session): self._db_session = db_session diff --git a/test/functional/mock_box/behavior/oauth2_behavior.py b/test/functional/mock_box/behavior/oauth2_behavior.py index a66465df..1e3127c5 100644 --- a/test/functional/mock_box/behavior/oauth2_behavior.py +++ b/test/functional/mock_box/behavior/oauth2_behavior.py @@ -16,7 +16,7 @@ from test.functional.mock_box.util.http_utils import abort -class OAuth2Behavior(object): +class OAuth2Behavior: ACCESS_TOKEN_DURATION_SECONDS = 3600 REFRESH_TOKEN_DURATION_DAYS = 60 AUTH_CODE_DURATION_SECONDS = 30 diff --git a/test/functional/mock_box/behavior/user_behavior.py b/test/functional/mock_box/behavior/user_behavior.py index cd51fe35..815b84b7 100644 --- a/test/functional/mock_box/behavior/user_behavior.py +++ b/test/functional/mock_box/behavior/user_behavior.py @@ -7,7 +7,7 @@ from test.functional.mock_box.util.http_utils import abort -class UserBehavior(object): +class UserBehavior: def __init__(self, db_session): self._db_session = db_session diff --git a/test/functional/mock_box/box.py b/test/functional/mock_box/box.py index ef728ca4..7a778928 100644 --- a/test/functional/mock_box/box.py +++ b/test/functional/mock_box/box.py @@ -44,7 +44,7 @@ TEMPLATE_PATH.insert(0, join(dirname(__file__), 'views')) -class Box(object): +class Box: """ Fake Box. Sets up 4 webservers - one for auth, one for upload, one for events, and one for the rest of the api. """ diff --git a/test/functional/mock_box/util/http_utils.py b/test/functional/mock_box/util/http_utils.py index 19dc1568..be3aa8ac 100644 --- a/test/functional/mock_box/util/http_utils.py +++ b/test/functional/mock_box/util/http_utils.py @@ -82,7 +82,7 @@ class StoppableWSGIRefServer(ServerAdapter): This is important for testing, since we don't want to "serve forever". """ def __init__(self, host='127.0.0.1', port=8080, **options): - super(StoppableWSGIRefServer, self).__init__(host, port, **options) + super().__init__(host, port, **options) self.srv = None self._thread = None diff --git a/test/functional/mock_box/util/json_utils.py b/test/functional/mock_box/util/json_utils.py index ebf80a01..519a0831 100644 --- a/test/functional/mock_box/util/json_utils.py +++ b/test/functional/mock_box/util/json_utils.py @@ -40,7 +40,7 @@ def default(self, o): if isinstance(o, FileModel): del fields['content'] return fields - return super(BoxObjectSerializer, self).default(o) + return super().default(o) return BoxObjectSerializer diff --git a/test/unit/util/test_compat.py b/test/unit/util/test_compat.py index 1e38c06c..c80bedd9 100644 --- a/test/unit/util/test_compat.py +++ b/test/unit/util/test_compat.py @@ -33,13 +33,13 @@ class Class2: class Meta(type): @classmethod - def __prepare__(metacls, name, this_bases, **kwds): # pylint:disable=unused-argument + def __prepare__(mcs, name, this_bases, **kwds): # pylint:disable=unused-argument assert this_bases == bases return {} - def __new__(metacls, name, this_bases, namespace, **kwds): + def __new__(mcs, name, this_bases, namespace, **kwds): assert this_bases == bases - return super(Meta, metacls).__new__(metacls, name, this_bases, namespace, **kwds) + return super(Meta, mcs).__new__(mcs, name, this_bases, namespace, **kwds) temporary_class = with_metaclass(Meta, *bases) assert isinstance(temporary_class, Meta)