remove unused callback argument

we have never used it and it is removed in tornado 6

and since we are still passing callback=None, this is causing upstream errors not to be raised,
since raise_errors is now the second positional argument

Author: minrk

nbviewer/providers/github/client.py

@@ -36,7 +36,7 @@ def authenticate(self):
             'access_token': os.environ.get('GITHUB_API_TOKEN', ''),
         }
 
-    def fetch(self, url, callback=None, params=None, **kwargs):
+    def fetch(self, url, params=None, **kwargs):
         """Add GitHub auth to self.client.fetch"""
         if not url.startswith(self.github_api_url):
             raise ValueError(
@@ -54,7 +54,7 @@ def fetch(self, url, callback=None, params=None, **kwargs):
             headers['Authorization'] = 'token ' + self.auth['access_token']
 
         url = url_concat(url, params)
-        future = self.client.fetch(url, callback, **kwargs)
+        future = self.client.fetch(url, **kwargs)
         future.add_done_callback(self._log_rate_limit)
         return future
 
@@ -99,39 +99,39 @@ def _log_rate_limit(self, future):
             log = app_log.warn
         log("%i/%i GitHub API requests remaining", remaining, limit)
 
-    def github_api_request(self, path, callback=None, **kwargs):
+    def github_api_request(self, path, **kwargs):
         """Make a GitHub API request to URL
         
         URL is constructed from url and params, if specified.
-        callback and **kwargs are passed to client.fetch unmodified.
+        **kwargs are passed to client.fetch unmodified.
         """
         url = url_path_join(self.github_api_url, quote(path))
-        return self.fetch(url, callback, **kwargs)
+        return self.fetch(url, **kwargs)
 
-    def get_gist(self, gist_id, callback=None, **kwargs):
+    def get_gist(self, gist_id, **kwargs):
         """Get a gist"""
         path = u'gists/{}'.format(gist_id)
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
-    def get_contents(self, user, repo, path, callback=None, ref=None, **kwargs):
+    def get_contents(self, user, repo, path, ref=None, **kwargs):
         """Make contents API request - either file contents or directory listing"""
         path = u'repos/{user}/{repo}/contents/{path}'.format(**locals())
         if ref is not None:
             params = kwargs.setdefault('params', {})
             params['ref'] = ref
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
-    def get_repos(self, user, callback=None, **kwargs):
+    def get_repos(self, user, **kwargs):
         """List a user's repos"""
         path = u"users/{user}/repos".format(user=user)
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
-    def get_gists(self, user, callback=None, **kwargs):
+    def get_gists(self, user, **kwargs):
         """List a user's gists"""
         path = u"users/{user}/gists".format(user=user)
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
-    def get_tree(self, user, repo, path, ref='master', recursive=False, callback=None, **kwargs):
+    def get_tree(self, user, repo, path, ref='master', recursive=False, **kwargs):
         """Get a git tree"""
         # only need a recursive fetch if it's not in the top-level dir
         if '/' in path:
@@ -140,18 +140,18 @@ def get_tree(self, user, repo, path, ref='master', recursive=False, callback=Non
         if recursive:
             params = kwargs.setdefault('params', {})
             params['recursive'] = True
-        tree = self.github_api_request(path, callback, **kwargs)
+        tree = self.github_api_request(path, **kwargs)
         return tree
 
-    def get_branches(self, user, repo, callback=None, **kwargs):
+    def get_branches(self, user, repo, **kwargs):
         """List a repo's branches"""
         path = u"repos/{user}/{repo}/branches".format(user=user, repo=repo)
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
-    def get_tags(self, user, repo, callback=None, **kwargs):
+    def get_tags(self, user, repo, **kwargs):
         """List a repo's branches"""
         path = u"repos/{user}/{repo}/tags".format(user=user, repo=repo)
-        return self.github_api_request(path, callback, **kwargs)
+        return self.github_api_request(path, **kwargs)
 
     def extract_tree_entry(self, path, tree_response):
         """extract a single tree entry from

nbviewer/providers/url/client.py

@@ -54,18 +54,18 @@ class NBViewerAsyncHTTPClient(object):
     def __init__(self, client=None):
         self.client = client or CurlAsyncHTTPClient()
 
-    def fetch(self, url, callback=None, params=None, **kwargs):
+    def fetch(self, url, params=None, **kwargs):
         request = HTTPRequest(url, **kwargs)
 
         if request.user_agent is None:
             request.user_agent = 'Tornado-Async-Client'
 
         # The future which will become the response upon awaiting.
-        response_future = asyncio.ensure_future(self.smart_fetch(request, callback))
+        response_future = asyncio.ensure_future(self.smart_fetch(request))
 
         return response_future
 
-    async def smart_fetch(self, request, callback):
+    async def smart_fetch(self, request):
         """
         Before fetching request, first look to see whether it's already in cache.
         If so load the response from cache. Only otherwise attempt to fetch the request.
@@ -95,7 +95,7 @@ async def smart_fetch(self, request, callback):
         else:
             app_log.info("Upstream cache miss %s", name)
 
-            response = await self.client.fetch(request, callback)
+            response = await self.client.fetch(request)
             dt = time.time() - tic
             app_log.info("Fetched %s in %.2f ms", name, 1e3 * dt)
             await self._cache_response(cache_key, name, response)
@@ -112,7 +112,7 @@ async def _get_cached_response(self, cache_key, name):
                 return pickle.loads(cached_pickle)
         except Exception:
             app_log.error("Upstream cache get failed %s", name, exc_info=True)
-    
+
     async def _cache_response(self, cache_key, name, response):
         """Cache the response, if any cache headers we understand are present."""
         if not self.cache: