Skip to content

Commit 102f2a5

Browse files
committed
Check for url and include urlparse
1 parent 6d7d683 commit 102f2a5

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

freesound.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
try: # python 3
2222
from urllib.request import urlopen, FancyUrlOpener, Request # noqa
23-
from urllib.parse import urlencode, quote
23+
from urllib.parse import urlparse, urlencode, quote
2424
from urllib.error import HTTPError
2525
except ImportError: # python 2.7
2626
from urllib import urlencode, FancyURLopener, quote
@@ -283,20 +283,23 @@ def previous_page(self):
283283
return FSRequest.request(self.previous, {}, self.client, Pager)
284284
def get_page(self, n):
285285
url = self.next
286-
287-
uri = urlparse(url)
288-
for index,item in enumerate(uri):
289-
if ('query' in item):
290-
urid=index
286+
287+
if (url):
288+
uri = urlparse(url)
289+
for index,item in enumerate(uri):
290+
if ('query' in item):
291+
urid=index
291292

292-
query = uri[urid].split("&")
293+
query = uri[urid].split("&")
293294

294-
for index,item in enumerate(query):
295-
if ("page" in item):
296-
query[index] = 'page=' + str(n)
295+
for index,item in enumerate(query):
296+
if ("page" in item):
297+
query[index] = 'page=' + str(n)
297298

298-
url = uri[0] + '://' + uri[1] + uri[2] + '?' + "&".join(query)
299-
return FSRequest.request(url, {}, self.client, Pager)
299+
url = uri[0] + '://' + uri[1] + uri[2] + '?' + "&".join(query)
300+
return FSRequest.request(url, {}, self.client, Pager)
301+
else:
302+
return None
300303

301304

302305

0 commit comments

Comments
 (0)