fixed requote_uri for python2

pylama.ini

@@ -1,5 +1,6 @@
 [pylama]
 linters = pyflakes,mccabe,pep8
+ignore = E731
 
 [pylama:mccabe]
 complexity = 16

tabulator/helpers.py

@@ -7,8 +7,9 @@
 import os
 import re
 import six
+import requests.utils
 from bs4 import BeautifulSoup
-from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import urlparse, urlunparse
 from chardet.universaldetector import UniversalDetector
 from . import exceptions
 
@@ -118,3 +119,23 @@ def ensure_dir(path):
     dirpath = os.path.dirname(path)
     if dirpath and not os.path.exists(dirpath):
         os.makedirs(dirpath)
+
+
+def requote_uri(uri):
+    """Requote uri if it contains non-ascii chars, spaces etc.
+
+    Args:
+        uri (str): uri to requote
+
+    """
+    if six.PY2:
+        def url_encode_non_ascii(bytes):
+            pattern = '[\x80-\xFF]'
+            replace = lambda c: ('%%%02x' % ord(c.group(0))).upper()
+            return re.sub(pattern, replace, bytes)
+        parts = urlparse(uri)
+        uri = urlunparse(
+            part.encode('idna') if index == 1
+            else url_encode_non_ascii(part.encode('utf-8'))
+            for index, part in enumerate(parts))
+    return requests.utils.requote_uri(uri)

tabulator/loaders/web.py

@@ -6,7 +6,6 @@
 
 import io
 import six
-from requests.utils import requote_uri
 from six.moves.urllib.request import urlopen
 from .. import exceptions
 from .. import helpers
@@ -26,8 +25,8 @@ def __init__(self, **options):
 
     def load(self, source, encoding, mode):
 
-        # Requote uri if it contains spaces etc
-        source = requote_uri(source)
+        # Requote uri
+        source = helpers.requote_uri(source)
 
         # Prepare bytes
         if six.PY2:

tests/test_helpers.py

@@ -71,3 +71,11 @@ def test_reset_stream_seekable():
 def test_reset_stream_not_seekable():
     with pytest.raises(Exception):
         helpers.reset_stream('not_seekable')
+
+
+def test_requote_uri():
+    url = 'http://next.openspending.org/fdp-adapter/convert?url=https%3A%2F%2Fraw.githubusercontent.com%2Fkravets-levko%2Fdata%2Fmaster%2Ftest.xlsx.csv'
+    url1 = 'http://data.defra.gov.uk/ops/government_procurement_card/over_£500_GPC_apr_2013.csv'
+    url2 = 'http://data.defra.gov.uk/ops/government_procurement_card/over_%C2%A3500_GPC_apr_2013.csv'
+    assert helpers.requote_uri(url) == url
+    assert helpers.requote_uri(url1) == url2