Merge pull request #2183 from nexB/revert-ftfy

Revert to another version of ftfy that runs Py2 and 3

Author: pombredanne

setup.py

@@ -137,7 +137,7 @@ def read(*names, **kwargs):
         # cluecode
         # Some nltk version ranges are buggy
         'nltk >= 3.2, < 4.0',
-        'py2_ipaddress >= 2.0, <3.5; python_version<"3"',
+        'py2_ipaddress >= 2.0, <3.5; python_version < "3"',
         'urlpy',
         'publicsuffix2',
         'fingerprints >= 0.6.0, < 1.0.0',
@@ -146,12 +146,12 @@ def read(*names, **kwargs):
         'patch >= 1.15, < 1.20 ',
         # to work around bug http://bugs.python.org/issue19839
         # on multistream bzip2 files: this can removed in Python 3.
-        'bz2file >= 0.98; python_version<"3"',
+        'bz2file >= 0.98; python_version < "3"',
         'extractcode_libarchive',
         'extractcode_7z',
 
         # commoncode
-        'backports.os == 0.1.1; python_version<"3"',
+        'backports.os == 0.1.1; python_version < "3"',
         'future >= 0.16.0',
         'text_unidecode >= 1.0, < 2.0',
         'saneyaml',
@@ -192,8 +192,8 @@ def read(*names, **kwargs):
         'dparse >= 0.4.1',
 
         # used to fix mojibake in Windows PE
-        'ftfy <  5.0.0; python_version == "2.7"',
-        'ftfy>=  5.0.0; python_version > "3"',
+        # for now we use the evrsion that works on both Python 2 and 3
+        'ftfy <  5.0.0',
 
         # scancode
         'click >= 6.0.0, < 7.0.0',
@@ -210,8 +210,8 @@ def read(*names, **kwargs):
 
         # ScanCode caching and locking
         'yg.lockfile >= 2.3, < 3.0.0',
-            # used by yg.lockfile
-            'contextlib2', 'pytz', 'tempora', 'jaraco.functools',
+        # used by yg.lockfile
+        'contextlib2', 'pytz', 'tempora', 'jaraco.functools',
         'zc.lockfile >= 2.0.0, < 3.0.0',
     ],
 

thirdparty/ftfy-4.4.3-py2-none-any.whl.ABOUT

@@ -0,0 +1,12 @@
+name: ftfy
+version: 4.4.3
+about_resource: ftfy-4.4.3-py2-none-any.whl
+download_url: https://files.pythonhosted.org/packages/21/5d/9385540977b00df1f3a0c0f07b7e6c15b5e7a3109d7f6ae78a0a764dab22/ftfy-4.4.3.tar.gz
+license_expression: mit
+copyright: Copyright (c) Rob Speer (rob@luminoso.com)
+attribute: yes
+package_url: pkg:pypi/ftfy@4.4.3
+licenses:
+  - key: mit
+    name: MIT License
+    file: mit.LICENSE

thirdparty/ftfy-4.4.3-py3-none-any.whl

@@ -0,0 +1,12 @@
+name: ftfy
+version: 4.4.3
+about_resource: ftfy-4.4.3-py3-none-any.whl
+download_url: https://files.pythonhosted.org/packages/21/5d/9385540977b00df1f3a0c0f07b7e6c15b5e7a3109d7f6ae78a0a764dab22/ftfy-4.4.3.tar.gz
+license_expression: mit
+copyright: Copyright (c) Rob Speer (rob@luminoso.com)
+attribute: yes
+package_url: pkg:pypi/ftfy@4.4.3
+licenses:
+  - key: mit
+    name: MIT License
+    file: mit.LICENSE