From 9bd7db1333b076be0bef18dec85018459a24da2b Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 3 Apr 2019 23:32:42 -0400 Subject: [PATCH 1/2] Convert dependency exclusion to marker format - Fixes #14 Signed-off-by: Dan Ryan --- setup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 2420ca0..bc3f68d 100644 --- a/setup.py +++ b/setup.py @@ -8,12 +8,6 @@ def README(): return f.read() -# Backward-compatibility dependencies for Python 2 -_python2_requires = [ - 'future', # For backport of surrogateescape -] if sys.version_info < (3,) else [] - - setup( name='backports.os', description="Backport of new features in Python's os module", @@ -29,7 +23,9 @@ def README(): setup_requires=['setuptools_scm'], use_scm_version=True, - install_requires=_python2_requires, + install_requires=[ + 'future;python_version<"3.0"', # For backport of surrogateescape + ], license='Python Software Foundation License', classifiers=[ From b761cb3f9831043b27ff5d6aa6e8d8a8b79ff025 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 4 Apr 2019 00:20:45 -0400 Subject: [PATCH 2/2] Add coverage skips for things I didn't change Signed-off-by: Dan Ryan --- src/backports/os.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backports/os.py b/src/backports/os.py index 060fe9e..cbd9541 100644 --- a/src/backports/os.py +++ b/src/backports/os.py @@ -42,9 +42,9 @@ def _invalid_utf8_indexes(bytes): # U+0080 - U+07FF - 11 bits c = (((c1 & 0x1F) << 6) | (c2 & 0x3F)) - if c < 0x80: + if c < 0x80: # pragma: no cover # Overlong encoding - skips.extend([i, i + 1]) + skips.extend([i, i + 1]) # pragma: no cover i += 2 continue c3 = bytes[i + 2] @@ -70,7 +70,7 @@ def _invalid_utf8_indexes(bytes): (c2 & 0x3F)) << 6) | (c3 & 0x3F)) << 6) | (c4 & 0x3F)) - if (c < 0x10000) or (c > 0x10FFFF): + if (c < 0x10000) or (c > 0x10FFFF): # pragma: no cover # Overlong encoding or invalid code point. skips.extend([i, i + 1, i + 2, i + 3]) i += 4