Merge pull request #1028 from Carreau/pyup

More pyupgrade cleanup.

Author: Carreau

nbviewer/providers/base.py

@@ -7,7 +7,6 @@
 import asyncio
 import hashlib
 import pickle
-import socket
 import time
 from contextlib import contextmanager
 from datetime import datetime
@@ -342,7 +341,7 @@ def client_error_message(self, exc, url, body, msg=None):
 
         if (msg is None) and body and len(body) < 100:
             # if it's a short plain-text error message, include it
-            msg = "%s (%s)" % (str_exc, escape(body))
+            msg = "{} ({})".format(str_exc, escape(body))
 
         if not msg:
             msg = str_exc
@@ -396,7 +395,7 @@ def catch_client_error(self):
             yield
         except httpclient.HTTPError as e:
             self.reraise_client_error(e)
-        except socket.error as e:
+        except OSError as e:
             raise web.HTTPError(404, str(e))
 
     @property
@@ -478,7 +477,7 @@ def cache_key(self):
     def truncate(self, s, limit=256):
         """Truncate long strings"""
         if len(s) > limit:
-            s = "%s...%s" % (s[: limit // 2], s[limit // 2 :])
+            s = "{}...{}".format(s[: limit // 2], s[limit // 2 :])
         return s
 
     async def cache_and_finish(self, content=""):
@@ -767,7 +766,7 @@ class FilesRedirectHandler(BaseHandler):
 
     def get(self, before_files, after_files):
         self.log.info("Redirecting %s to %s", before_files, after_files)
-        self.redirect("%s/%s" % (before_files, after_files))
+        self.redirect("{}/{}".format(before_files, after_files))
 
 
 class AddSlashHandler(BaseHandler):
@@ -776,7 +775,7 @@ class AddSlashHandler(BaseHandler):
     def get(self, *args, **kwargs):
         uri = self.request.path + "/"
         if self.request.query:
-            uri = "%s?%s" % (uri, self.request.query)
+            uri = "{}?{}".format(uri, self.request.query)
         self.redirect(uri)
 
 
@@ -786,5 +785,5 @@ class RemoveSlashHandler(BaseHandler):
     def get(self, *args, **kwargs):
         uri = self.request.path.rstrip("/")
         if self.request.query:
-            uri = "%s?%s" % (uri, self.request.query)
+            uri = "{}?{}".format(uri, self.request.query)
         self.redirect(uri)

nbviewer/providers/gist/handlers.py

@@ -159,7 +159,7 @@ async def tree_get(self, user, gist_id, gist, files):
             e = {}
             e["name"] = file["filename"]
             if file["filename"].endswith(".ipynb"):
-                e["url"] = quote("/%s/%s" % (gist_id, file["filename"]))
+                e["url"] = quote("/{}/{}".format(gist_id, file["filename"]))
                 e["class"] = "fa-book"
                 ipynbs.append(e)
             else:
@@ -318,9 +318,9 @@ class GistRedirectHandler(BaseHandler):
     """redirect old /<gist-id> to new /gist/<gist-id>"""
 
     def get(self, gist_id, file=""):
-        new_url = "%s/gist/%s" % (self.format_prefix, gist_id)
+        new_url = "{}/gist/{}".format(self.format_prefix, gist_id)
         if file:
-            new_url = "%s/%s" % (new_url, file)
+            new_url = "{}/{}".format(new_url, file)
 
         self.log.info("Redirecting %s to %s", self.request.uri, new_url)
         self.redirect(self.from_base(new_url))

nbviewer/providers/github/client.py

@@ -21,7 +21,7 @@
 # -----------------------------------------------------------------------------
 
 
-class AsyncGitHubClient(object):
+class AsyncGitHubClient:
     """AsyncHTTPClient wrapper with methods for common requests"""
 
     auth = None

nbviewer/providers/github/handlers.py

@@ -25,7 +25,7 @@
 from .client import AsyncGitHubClient
 
 
-class GithubClientMixin(object):
+class GithubClientMixin:
 
     # PROVIDER_CTX is a dictionary whose entries are passed as keyword arguments
     # to the render_template method of the GistHandler. The following describe

nbviewer/providers/local/handlers.py

@@ -5,7 +5,6 @@
 #  the file COPYING, distributed as part of this software.
 # -----------------------------------------------------------------------------
 import errno
-import io
 import os
 import stat
 from datetime import datetime
@@ -150,9 +149,9 @@ async def get_notebook_data(self, path):
 
     async def deliver_notebook(self, fullpath, path):
         try:
-            with io.open(fullpath, encoding="utf-8") as f:
+            with open(fullpath, encoding="utf-8") as f:
                 nbdata = f.read()
-        except IOError as ex:
+        except OSError as ex:
             if ex.errno == errno.EACCES:
                 # py3: can't read the file, so don't give away it exists
                 self.log.info(
@@ -236,7 +235,7 @@ def show_dir(self, fullpath, path, **namespace):
 
         try:
             contents = os.listdir(fullpath)
-        except IOError as ex:
+        except OSError as ex:
             if ex.errno == errno.EACCES:
                 # can't access the dir, so don't give away its presence
                 self.log.info(