Skip to content

Commit a44cb21

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 2a96bfc commit a44cb21

File tree

9 files changed

+93
-93
lines changed

9 files changed

+93
-93
lines changed

‎nbviewer/providers/dropbox/handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ def uri_rewrites(rewrites=[]):
1010
return rewrites + [
1111
(
1212
r"^http(s?)://www.dropbox.com/(sh?)/(.+?)(\?dl=.)*$",
13-
u"/url{0}/dl.dropbox.com/{1}/{2}",
13+
"/url{0}/dl.dropbox.com/{1}/{2}",
1414
)
1515
]

‎nbviewer/providers/gist/handlers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async def get(self, user, **namespace):
100100
gist_base_url = "https://gist.github.com/"
101101
else:
102102
gist_base_url = url_path_join(self.github_url, "gist/")
103-
provider_url = url_path_join(gist_base_url, u"{user}".format(user=user))
103+
provider_url = url_path_join(gist_base_url, "{user}".format(user=user))
104104
html = self.render_usergists_template(
105105
entries=entries,
106106
user=user,
@@ -131,7 +131,7 @@ async def parse_gist(self, user, gist_id, filename=""):
131131
user = owner_dict["login"]
132132
else:
133133
user = "anonymous"
134-
new_url = u"{format}/gist/{user}/{gist_id}".format(
134+
new_url = "{format}/gist/{user}/{gist_id}".format(
135135
format=self.format_prefix, user=user, gist_id=gist_id
136136
)
137137
if filename:
@@ -169,7 +169,7 @@ async def tree_get(self, user, gist_id, gist, files):
169169
gist_base_url = url_path_join(self.github_url, "gist/")
170170
provider_url = url_path_join(
171171
gist_base_url,
172-
u"{user}/{gist_id}#file-{clean_name}".format(
172+
"{user}/{gist_id}#file-{clean_name}".format(
173173
user=user,
174174
gist_id=gist_id,
175175
clean_name=clean_filename(file["filename"]),
@@ -345,8 +345,8 @@ def default_handlers(handlers=[], **handler_names):
345345

346346
def uri_rewrites(rewrites=[]):
347347
gist_rewrites = [
348-
(r"^([a-f0-9]+)/?$", u"/{0}"),
349-
(r"^https?://gist.github.com/([^\/]+/)?([a-f0-9]+)/?$", u"/{1}"),
348+
(r"^([a-f0-9]+)/?$", "/{0}"),
349+
(r"^https?://gist.github.com/([^\/]+/)?([a-f0-9]+)/?$", "/{1}"),
350350
]
351351
# github enterprise
352352
if os.environ.get("GITHUB_API_URL", "") != "":
@@ -356,7 +356,7 @@ def uri_rewrites(rewrites=[]):
356356
gist_rewrites.extend(
357357
[
358358
# Fetching the Gist ID which is embedded in the URL, but with a different base URL
359-
(r"^" + gist_base_url + r"([^\/]+/)?([a-f0-9]+)/?$", u"/{1}")
359+
(r"^" + gist_base_url + r"([^\/]+/)?([a-f0-9]+)/?$", "/{1}")
360360
]
361361
)
362362

‎nbviewer/providers/github/client.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,38 +114,38 @@ def github_api_request(self, path, **kwargs):
114114

115115
def get_gist(self, gist_id, **kwargs):
116116
"""Get a gist"""
117-
path = u"gists/{}".format(gist_id)
117+
path = "gists/{}".format(gist_id)
118118
return self.github_api_request(path, **kwargs)
119119

120120
def get_contents(self, user, repo, path, ref=None, **kwargs):
121121
"""Make contents API request - either file contents or directory listing"""
122-
path = u"repos/{user}/{repo}/contents/{path}".format(**locals())
122+
path = "repos/{user}/{repo}/contents/{path}".format(**locals())
123123
if ref is not None:
124124
params = kwargs.setdefault("params", {})
125125
params["ref"] = ref
126126
return self.github_api_request(path, **kwargs)
127127

128128
def get_repos(self, user, **kwargs):
129129
"""List a user's repos"""
130-
path = u"users/{user}/repos".format(user=user)
130+
path = "users/{user}/repos".format(user=user)
131131
return self.github_api_request(path, **kwargs)
132132

133133
def get_gists(self, user, **kwargs):
134134
"""List a user's gists"""
135-
path = u"users/{user}/gists".format(user=user)
135+
path = "users/{user}/gists".format(user=user)
136136
return self.github_api_request(path, **kwargs)
137137

138138
def get_repo(self, user, repo, **kwargs):
139139
"""List a repo's branches"""
140-
path = u"repos/{user}/{repo}".format(user=user, repo=repo)
140+
path = "repos/{user}/{repo}".format(user=user, repo=repo)
141141
return self.github_api_request(path, **kwargs)
142142

143143
def get_tree(self, user, repo, path, ref="master", recursive=False, **kwargs):
144144
"""Get a git tree"""
145145
# only need a recursive fetch if it's not in the top-level dir
146146
if "/" in path:
147147
recursive = True
148-
path = u"repos/{user}/{repo}/git/trees/{ref}".format(**locals())
148+
path = "repos/{user}/{repo}/git/trees/{ref}".format(**locals())
149149
if recursive:
150150
params = kwargs.setdefault("params", {})
151151
params["recursive"] = True
@@ -154,12 +154,12 @@ def get_tree(self, user, repo, path, ref="master", recursive=False, **kwargs):
154154

155155
def get_branches(self, user, repo, **kwargs):
156156
"""List a repo's branches"""
157-
path = u"repos/{user}/{repo}/branches".format(user=user, repo=repo)
157+
path = "repos/{user}/{repo}/branches".format(user=user, repo=repo)
158158
return self.github_api_request(path, **kwargs)
159159

160160
def get_tags(self, user, repo, **kwargs):
161161
"""List a repo's branches"""
162-
path = u"repos/{user}/{repo}/tags".format(user=user, repo=repo)
162+
path = "repos/{user}/{repo}/tags".format(user=user, repo=repo)
163163
return self.github_api_request(path, **kwargs)
164164

165165
def extract_tree_entry(self, path, tree_response):

‎nbviewer/providers/github/handlers.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class RawGitHubURLHandler(BaseHandler):
8181
"""redirect old /urls/raw.github urls to /github/ API urls"""
8282

8383
def get(self, user, repo, path):
84-
new_url = u"{format}/github/{user}/{repo}/blob/{path}".format(
84+
new_url = "{format}/github/{user}/{repo}/blob/{path}".format(
8585
format=self.format_prefix, user=user, repo=repo, path=path
8686
)
8787
self.log.info("Redirecting %s to %s", self.request.uri, new_url)
@@ -92,7 +92,7 @@ class GitHubRedirectHandler(GithubClientMixin, BaseHandler):
9292
"""redirect github urls to /github/ API urls"""
9393

9494
def get(self, url):
95-
new_url = u"{format}/github/{url}".format(format=self.format_prefix, url=url)
95+
new_url = "{format}/github/{url}".format(format=self.format_prefix, url=url)
9696
self.log.info("Redirecting %s to %s", self.request.uri, new_url)
9797
self.redirect(self.from_base(new_url))
9898

@@ -129,7 +129,7 @@ async def get(self, user):
129129
for repo in repos:
130130
entries.append(dict(url=repo["name"], name=repo["name"]))
131131

132-
provider_url = u"{github_url}{user}".format(
132+
provider_url = "{github_url}{user}".format(
133133
user=user, github_url=self.github_url
134134
)
135135
html = self.render_github_user_template(
@@ -212,7 +212,7 @@ async def get(self, user, repo, ref, path):
212212
branches, tags = await self.refs(user, repo)
213213

214214
for nav_ref in branches + tags:
215-
nav_ref["url"] = u"/github/{user}/{repo}/tree/{ref}/{path}".format(
215+
nav_ref["url"] = "/github/{user}/{repo}/tree/{ref}/{path}".format(
216216
ref=nav_ref["name"], user=user, repo=repo, path=path
217217
)
218218

@@ -224,7 +224,7 @@ async def get(self, user, repo, ref, path):
224224
),
225225
)
226226
self.redirect(
227-
u"{format}/github/{user}/{repo}/blob/{ref}/{path}".format(
227+
"{format}/github/{user}/{repo}/blob/{ref}/{path}".format(
228228
format=self.format_prefix, user=user, repo=repo, ref=ref, path=path
229229
)
230230
)
@@ -238,11 +238,11 @@ async def get(self, user, repo, ref, path):
238238
example_file_url,
239239
).group("user", "repo")
240240

241-
base_url = u"/github/{user}/{repo}/tree/{ref}".format(
241+
base_url = "/github/{user}/{repo}/tree/{ref}".format(
242242
user=user, repo=repo, ref=ref
243243
)
244244

245-
provider_url = u"{github_url}{user}/{repo}/tree/{ref}/{path}".format(
245+
provider_url = "{github_url}{user}/{repo}/tree/{ref}/{path}".format(
246246
user=user, repo=repo, ref=ref, path=path, github_url=self.github_url
247247
)
248248

@@ -257,14 +257,14 @@ async def get(self, user, repo, ref, path):
257257
e = {}
258258
e["name"] = file["name"]
259259
if file["type"] == "dir":
260-
e["url"] = u"/github/{user}/{repo}/tree/{ref}/{path}".format(
260+
e["url"] = "/github/{user}/{repo}/tree/{ref}/{path}".format(
261261
user=user, repo=repo, ref=ref, path=file["path"]
262262
)
263263
e["url"] = quote(e["url"])
264264
e["class"] = "fa-folder-open"
265265
dirs.append(e)
266266
elif file["name"].endswith(".ipynb"):
267-
e["url"] = u"/github/{user}/{repo}/blob/{ref}/{path}".format(
267+
e["url"] = "/github/{user}/{repo}/blob/{ref}/{path}".format(
268268
user=user, repo=repo, ref=ref, path=file["path"]
269269
)
270270
e["url"] = quote(e["url"])
@@ -335,15 +335,15 @@ class GitHubBlobHandler(GithubClientMixin, RenderingHandler):
335335
async def get_notebook_data(self, user, repo, ref, path):
336336
if os.environ.get("GITHUB_API_URL", "") == "":
337337
raw_url = (
338-
u"https://raw.githubusercontent.com/{user}/{repo}/{ref}/{path}".format(
338+
"https://raw.githubusercontent.com/{user}/{repo}/{ref}/{path}".format(
339339
user=user, repo=repo, ref=ref, path=quote(path)
340340
)
341341
)
342342
else: # Github Enterprise has a different URL pattern for accessing raw files
343343
raw_url = url_path_join(
344344
self.github_url, user, repo, "raw", ref, quote(path)
345345
)
346-
blob_url = u"{github_url}{user}/{repo}/blob/{ref}/{path}".format(
346+
blob_url = "{github_url}{user}/{repo}/blob/{ref}/{path}".format(
347347
user=user, repo=repo, ref=ref, path=quote(path), github_url=self.github_url
348348
)
349349
with self.catch_client_error():
@@ -508,25 +508,25 @@ def uri_rewrites(rewrites=[]):
508508
# three different uris for a raw view
509509
(
510510
r"^https?://github\.com/([^\/]+)/([^\/]+)/raw/([^\/]+)/(.*)",
511-
u"/github/{0}/{1}/blob/{2}/{3}",
511+
"/github/{0}/{1}/blob/{2}/{3}",
512512
),
513513
(
514514
r"^https?://raw\.github\.com/([^\/]+)/([^\/]+)/(.*)",
515-
u"/github/{0}/{1}/blob/{2}",
515+
"/github/{0}/{1}/blob/{2}",
516516
),
517517
(
518518
r"^https?://raw\.githubusercontent\.com/([^\/]+)/([^\/]+)/(.*)",
519-
u"/github/{0}/{1}/blob/{2}",
519+
"/github/{0}/{1}/blob/{2}",
520520
),
521521
# trees & blobs
522522
(
523523
r"^https?://github.com/([\w\-]+)/([^\/]+)/(blob|tree)/(.*)$",
524-
u"/github/{0}/{1}/{2}/{3}",
524+
"/github/{0}/{1}/{2}/{3}",
525525
),
526526
# user/repo
527-
(r"^([\w\-]+)/([^\/]+)$", u"/github/{0}/{1}/tree/master/"),
527+
(r"^([\w\-]+)/([^\/]+)$", "/github/{0}/{1}/tree/master/"),
528528
# user
529-
(r"^([\w\-]+)$", u"/github/{0}/"),
529+
(r"^([\w\-]+)$", "/github/{0}/"),
530530
]
531531
# github enterprise
532532
if os.environ.get("GITHUB_API_URL", "") != "":
@@ -537,20 +537,20 @@ def uri_rewrites(rewrites=[]):
537537
# raw view
538538
(
539539
r"^" + github_base_url + r"([^\/]+)/([^\/]+)/raw/([^\/]+)/(.*)",
540-
u"/github/{0}/{1}/blob/{2}/{3}",
540+
"/github/{0}/{1}/blob/{2}/{3}",
541541
),
542542
# trees & blobs
543543
(
544544
r"^" + github_base_url + r"([\w\-]+)/([^\/]+)/(blob|tree)/(.*)$",
545-
u"/github/{0}/{1}/{2}/{3}",
545+
"/github/{0}/{1}/{2}/{3}",
546546
),
547547
# user/repo
548548
(
549549
r"^" + github_base_url + r"([\w\-]+)/([^\/]+)/?$",
550-
u"/github/{0}/{1}/tree/master",
550+
"/github/{0}/{1}/tree/master",
551551
),
552552
# user
553-
(r"^" + github_base_url + r"([\w\-]+)/?$", u"/github/{0}/"),
553+
(r"^" + github_base_url + r"([\w\-]+)/?$", "/github/{0}/"),
554554
]
555555
)
556556
return rewrites + github_rewrites

‎nbviewer/providers/github/tests/test_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ def test_get_repos(self):
6262
def test_get_contents(self):
6363
user = "username"
6464
repo = "my_awesome_repo"
65-
path = u"möre-path"
65+
path = "möre-path"
6666
self.gh_client.get_contents(user, repo, path)
6767
url = self._get_url()
68-
correct_url = u"https://api.github.com" + quote(
69-
u"/repos/username/my_awesome_repo/contents/möre-path"
68+
correct_url = "https://api.github.com" + quote(
69+
"/repos/username/my_awesome_repo/contents/möre-path"
7070
)
7171
self.assertStartsWith(url, correct_url)
7272

‎nbviewer/providers/github/tests/test_github.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_github_unicode(self):
2929
url = self.url(
3030
"github/tlapicka/IPythonNotebooks/blob",
3131
"ee6d2d13b96023e5f5e38e4516803eb22ede977e",
32-
u"Matplotlib -- osy a mřížka.ipynb",
32+
"Matplotlib -- osy a mřížka.ipynb",
3333
)
3434
r = requests.get(url)
3535
self.assertEqual(r.status_code, 200)
@@ -39,7 +39,7 @@ def test_github_blob_redirect_unicode(self):
3939
url = self.url(
4040
"/urls/github.com/tlapicka/IPythonNotebooks/blob",
4141
"ee6d2d13b96023e5f5e38e4516803eb22ede977e",
42-
u"Matplotlib -- osy a mřížka.ipynb",
42+
"Matplotlib -- osy a mřížka.ipynb",
4343
)
4444
r = requests.get(url)
4545
self.assertEqual(r.status_code, 200)
@@ -51,7 +51,7 @@ def test_github_raw_redirect_unicode(self):
5151
url = self.url(
5252
"/url/raw.github.com/tlapicka/IPythonNotebooks",
5353
"ee6d2d13b96023e5f5e38e4516803eb22ede977e",
54-
u"Matplotlib -- osy a mřížka.ipynb",
54+
"Matplotlib -- osy a mřížka.ipynb",
5555
)
5656
r = requests.get(url)
5757
self.assertEqual(r.status_code, 200)

‎nbviewer/providers/github/tests/test_handlers.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,51 @@ def assert_rewrite_ghe(self, uri, rewrite):
2121
self.assertEqual(new, rewrite)
2222

2323
def test_githubusercontent(self):
24-
uri = u"https://raw.githubusercontent.com/user/reopname/deadbeef/a mřížka.ipynb"
25-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
24+
uri = "https://raw.githubusercontent.com/user/reopname/deadbeef/a mřížka.ipynb"
25+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
2626
self.assert_rewrite(uri, rewrite)
2727

2828
def test_blob(self):
29-
uri = u"https://github.com/user/reopname/blob/deadbeef/a mřížka.ipynb"
30-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
29+
uri = "https://github.com/user/reopname/blob/deadbeef/a mřížka.ipynb"
30+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
3131
self.assert_rewrite(uri, rewrite)
3232

3333
def test_raw_uri(self):
34-
uri = u"https://github.com/user/reopname/raw/deadbeef/a mřížka.ipynb"
35-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
34+
uri = "https://github.com/user/reopname/raw/deadbeef/a mřížka.ipynb"
35+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
3636
self.assert_rewrite(uri, rewrite)
3737

3838
def test_raw_subdomain(self):
39-
uri = u"https://raw.github.com/user/reopname/deadbeef/a mřížka.ipynb"
40-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
39+
uri = "https://raw.github.com/user/reopname/deadbeef/a mřížka.ipynb"
40+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
4141
self.assert_rewrite(uri, rewrite)
4242

4343
def test_tree(self):
44-
uri = u"https://github.com/user/reopname/tree/deadbeef/a mřížka.ipynb"
45-
rewrite = u"/github/user/reopname/tree/deadbeef/a mřížka.ipynb"
44+
uri = "https://github.com/user/reopname/tree/deadbeef/a mřížka.ipynb"
45+
rewrite = "/github/user/reopname/tree/deadbeef/a mřížka.ipynb"
4646
self.assert_rewrite(uri, rewrite)
4747

4848
def test_userrepo(self):
49-
uri = u"username/reponame"
50-
rewrite = u"/github/username/reponame/tree/master/"
49+
uri = "username/reponame"
50+
rewrite = "/github/username/reponame/tree/master/"
5151
self.assert_rewrite(uri, rewrite)
5252

5353
def test_user(self):
54-
uri = u"username"
55-
rewrite = u"/github/username/"
54+
uri = "username"
55+
rewrite = "/github/username/"
5656
self.assert_rewrite(uri, rewrite)
5757

5858
def test_ghe_blob(self):
59-
uri = u"https://example.com/user/reopname/blob/deadbeef/a mřížka.ipynb"
60-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
59+
uri = "https://example.com/user/reopname/blob/deadbeef/a mřížka.ipynb"
60+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
6161
self.assert_rewrite_ghe(uri, rewrite)
6262

6363
def test_ghe_raw_uri(self):
64-
uri = u"https://example.com/user/reopname/raw/deadbeef/a mřížka.ipynb"
65-
rewrite = u"/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
64+
uri = "https://example.com/user/reopname/raw/deadbeef/a mřížka.ipynb"
65+
rewrite = "/github/user/reopname/blob/deadbeef/a mřížka.ipynb"
6666
self.assert_rewrite_ghe(uri, rewrite)
6767

6868
def test_ghe_tree(self):
69-
uri = u"https://example.com/user/reopname/tree/deadbeef/a mřížka.ipynb"
70-
rewrite = u"/github/user/reopname/tree/deadbeef/a mřížka.ipynb"
69+
uri = "https://example.com/user/reopname/tree/deadbeef/a mřížka.ipynb"
70+
rewrite = "/github/user/reopname/tree/deadbeef/a mřížka.ipynb"
7171
self.assert_rewrite_ghe(uri, rewrite)

‎nbviewer/providers/url/handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async def get_notebook_data(self, secure, netloc, url):
3030
else:
3131
query = None
3232

33-
remote_url = u"{}://{}/{}".format(proto, netloc, quote(url))
33+
remote_url = "{}://{}/{}".format(proto, netloc, quote(url))
3434

3535
if query:
3636
remote_url = remote_url + "?" + query
@@ -101,4 +101,4 @@ def default_handlers(handlers=[], **handler_names):
101101

102102

103103
def uri_rewrites(rewrites=[]):
104-
return rewrites + [("^http(s?)://(.*)$", u"/url{0}/{1}"), ("^(.*)$", u"/url/{0}")]
104+
return rewrites + [("^http(s?)://(.*)$", "/url{0}/{1}"), ("^(.*)$", "/url/{0}")]

0 commit comments

Comments
 (0)