From 783d61d32aba53208b2b0bb9a1d82a56dbcbabd6 Mon Sep 17 00:00:00 2001 From: sbs2001 Date: Thu, 1 Aug 2019 14:11:27 +0530 Subject: [PATCH] [MRG+1] Update _monkeypatches.py (#3907) * Update _monkeypatches.py The workarounds are not required assuming the bugs regarding urlparse are absent in Python versions >2.7. We already exit the program if Python version<2.7 in the __init__.py(line 17).The monkeypatches are deployed after this check at line 27 in the __init__.py . * Update _monkeypatches.py Added the second workaround. * Update _monkeypatches.py * Update _monkeypatches.py --- scrapy/_monkeypatches.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scrapy/_monkeypatches.py b/scrapy/_monkeypatches.py index 935c4bfa3..b68099cad 100644 --- a/scrapy/_monkeypatches.py +++ b/scrapy/_monkeypatches.py @@ -4,12 +4,7 @@ from six.moves import copyreg if six.PY2: from urlparse import urlparse - - # workaround for https://bugs.python.org/issue7904 - Python < 2.7 - if urlparse('s3://bucket/key').netloc != 'bucket': - from urlparse import uses_netloc - uses_netloc.append('s3') - + # workaround for https://bugs.python.org/issue9374 - Python < 2.7.4 if urlparse('s3://bucket/key?key=value').query != 'key=value': from urlparse import uses_query