Merge pull request #881 from krinsman/step7_2

remove python2 super syntax

Author: minrk

nbviewer/cache.py

@@ -155,7 +155,7 @@ class AsyncMultipartMemcache(AsyncMemcache):
     def __init__(self, *args, **kwargs):
         self.chunk_size = kwargs.pop('chunk_size', 950000)
         self.max_chunks = kwargs.pop('max_chunks', 16)
-        super(AsyncMultipartMemcache, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     async def get(self, key, *args, **kwargs):
         keys = [('%s.%i' % (key, idx)).encode()

nbviewer/handlers.py

@@ -25,7 +25,7 @@
 class Custom404(BaseHandler):
     """Render our 404 template"""
     def prepare(self):
-        super(BaseHandler, self).prepare()
+        super().prepare()
         raise web.HTTPError(404)
 
 

nbviewer/providers/base.py

@@ -83,7 +83,7 @@ def redirect(self, url, *args, **kwargs):
             purl.fragment
         ))
 
-        return super(BaseHandler, self).redirect(
+        return super().redirect(
             eurl,
             *args,
             **kwargs
@@ -585,7 +585,7 @@ def render_timeout(self):
         return self.settings.setdefault('render_timeout', 0)
 
     def initialize(self, **kwargs):
-        super(RenderingHandler, self).initialize(**kwargs)
+        super().initialize(**kwargs)
         loop = IOLoop.current()
         if self.render_timeout:
             self.slow_timeout = loop.add_timeout(

nbviewer/providers/gist/handlers.py

@@ -52,7 +52,7 @@ def client_error_message(self, exc, url, body, msg=None):
         if exc.code == 403 and 'too big' in body.lower():
             return 400, "GitHub will not serve raw gists larger than 10MB"
 
-        return super(GistClientMixin, self).client_error_message(
+        return super().client_error_message(
             exc, url, body, msg
         )
 

nbviewer/providers/github/handlers.py

@@ -83,7 +83,7 @@ def client_error_message(self, exc, url, body, msg=None):
         if exc.code == 403 and 'rate limit' in body.lower():
             return 503, "GitHub API rate limit exceeded. Try again soon."
 
-        return super(GithubClientMixin, self).client_error_message(
+        return super().client_error_message(
             exc, url, body, msg
         )
 

nbviewer/providers/github/tests/test_client.py

@@ -3,7 +3,7 @@
 import unittest.mock as mock
 
 from tornado.httpclient import AsyncHTTPClient
-from tornado.testing import AsyncTestCase, gen_test
+from tornado.testing import AsyncTestCase
 
 from ..client import AsyncGitHubClient
 from ....utils import quote
@@ -12,7 +12,7 @@
 class GithubClientTest(AsyncTestCase):
     """Tests that the github API client makes the correct http requests."""
     def setUp(self):
-        super(GithubClientTest, self).setUp()
+        super().setUp()
         # Need a mock HTTPClient for the github client to talk to.
         self.http_client = mock.create_autospec(AsyncHTTPClient)
 

nbviewer/providers/local/handlers.py

@@ -61,7 +61,7 @@ def breadcrumbs(self, path):
             'url': url_path_join(self.base_url, self._localfile_path),
             'name': 'home'
         }]
-        breadcrumbs.extend(super(LocalFileHandler, self).breadcrumbs(path, self._localfile_path))
+        breadcrumbs.extend(super().breadcrumbs(path, self._localfile_path))
         return breadcrumbs
 
     async def download(self, fullpath):

nbviewer/tests/async_base.py

@@ -16,7 +16,7 @@ def get_app(self):
     def assertIn(self, observed, expected, *args, **kwargs):
         """ test whether the observed contains the expected, in utf-8
         """
-        return super(AsyncNbviewerTestCase, self).assertIn(
+        return super().assertIn(
             to_unicode(observed),
             to_unicode(expected),
             *args,
@@ -26,7 +26,7 @@ def assertIn(self, observed, expected, *args, **kwargs):
     def assertNotIn(self, observed, expected, *args, **kwargs):
         """ test whether the observed does not contain the expected, in utf-8
         """
-        return super(AsyncNbviewerTestCase, self).assertNotIn(
+        return super().assertNotIn(
             to_unicode(observed),
             to_unicode(expected),
             *args,

nbviewer/tests/base.py

@@ -31,15 +31,15 @@ class NBViewerTestCase(TestCase):
     port = 12341
 
     def assertIn(self, observed, expected, *args, **kwargs):
-        return super(NBViewerTestCase, self).assertIn(
+        return super().assertIn(
             to_unicode(observed),
             to_unicode(expected),
             *args,
             **kwargs
         )
 
     def assertNotIn(self, observed, expected, *args, **kwargs):
-        return super(NBViewerTestCase, self).assertNotIn(
+        return super().assertNotIn(
             to_unicode(observed),
             to_unicode(expected),
             *args,

nbviewer/tests/test_config.py

@@ -20,7 +20,7 @@ def test_used_custom_template(self):
 class TemplatePathCLITestCase(NBViewerTestCase, CustomTemplateStub):
     @classmethod
     def get_server_args(cls):
-        return super(TemplatePathCLITestCase, cls).get_server_args() + [
+        return super().get_server_args() + [
             '--template_path={}'.format(tmpl_fixture),
         ]