Removed dependency on 'six' package; cleaned up conditions for DictVi…

…ew methods

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>

dev-requirements.txt

@@ -102,6 +102,11 @@ readme-renderer>=23.0; python_version >= '3.5'
 
 # Indirect dependencies with special constraints:
 
+# six (also used by virtualenv, tox, probably others)
+# virtualenv 20.0 requires six>=1.12.0 on py>=3.8
+# tox 3.17 requires six>=1.14.0
+six>=1.14.0
+
 # pytz (used by TBD)
 pytz>=2016.10
 

docs/changes.rst

@@ -20,6 +20,8 @@ Released: not yet
 
 **Enhancements:**
 
+* Removed dependency to 'six' package.
+
 **Cleanup:**
 
 * Docs: Simplified the introduction section.

immutable_views/_dict_view.py

@@ -4,20 +4,26 @@
 
 from __future__ import print_function, absolute_import
 
+import sys
 import os
 try:
     from collections.abc import Mapping
 except ImportError:
     # Python 2
     from collections import Mapping
-import six
 
 __all__ = ['DictView']
 
-# This env var is set when building the docs. It causes the methods
-# that are supposed to exist only in a particular Python version, not to be
-# removed, so they appear in the docs.
-BUILDING_DOCS = os.environ.get('BUILDING_DOCS', False)
+# This env var is set when building the docs. It causes the methods that are
+# supposed to exist only under certain circumstances, not to be removed, so
+# that they appear in the docs.
+_BUILDING_DOCS = os.environ.get('BUILDING_DOCS', False)
+
+# Indicates Python dict supports the iter..() and view..() methods
+_DICT_SUPPORTS_ITER_VIEW = sys.version_info[0:2] == (2, 7)
+
+# Indicates Python dict supports the has_key() method
+_DICT_SUPPORTS_HAS_KEY = sys.version_info[0:2] == (2, 7)
 
 
 class DictView(Mapping):
@@ -415,14 +421,16 @@ def __le__(self, other):
         return self._dict <= other_dict
 
 
-# Remove methods that should only be present in a particular Python version
-# If the documentation is built, the methods are not removed in order to show
-# them in the documentation.
-if not six.PY2 and not BUILDING_DOCS:
-    del DictView.has_key
+# Remove methods that should only be present under certain circumstances,
+# except if the documentation is built.
+
+if not _DICT_SUPPORTS_ITER_VIEW and not _BUILDING_DOCS:
     del DictView.iterkeys
     del DictView.itervalues
     del DictView.iteritems
     del DictView.viewkeys
     del DictView.viewvalues
     del DictView.viewitems
+
+if not _DICT_SUPPORTS_HAS_KEY and not _BUILDING_DOCS:
+    del DictView.has_key

requirements.txt

@@ -15,10 +15,7 @@
 
 # Direct dependencies (except pip, setuptools, wheel):
 
-# six (also used by virtualenv, tox, probably others)
-# virtualenv 20.0 requires six>=1.12.0 on py>=3.8
-# tox 3.17 requires six>=1.14.0
-six>=1.14.0
+# None
 
 
 # Indirect dependencies are not specified in this file.

tests/unittest/test_dict_view.py

@@ -38,6 +38,9 @@
 # Indicates Python dict supports the iter..() and view..() methods
 DICT_SUPPORTS_ITER_VIEW = sys.version_info[0:2] == (2, 7)
 
+# Indicates Python dict supports the has_key() method
+DICT_SUPPORTS_HAS_KEY = sys.version_info[0:2] == (2, 7)
+
 # Used as indicator not to pass an argument in the testcases.
 # Note this has nothing to do with the _OMITTED flag in _immutable_views.py and
 # could be a different value.
@@ -643,7 +646,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key=None,
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Empty dict, with integer key (no lower / success)",
@@ -652,7 +655,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key=1234,
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Empty dict, with empty string key (not found)",
@@ -661,7 +664,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key='',
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Empty dict, with non-empty key (not found)",
@@ -670,7 +673,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key='Dog',
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
 
     # Non-empty DictView
@@ -681,7 +684,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key=None,
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Non-empty dict, with empty string key (not found)",
@@ -690,7 +693,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key='',
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Non-empty dict, with non-empty key (not found)",
@@ -699,7 +702,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key='invalid',
             exp_result=False,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
     (
         "Non-empty dict, with existing key",
@@ -708,7 +711,7 @@ def test_DictView_contains(testcase, obj, key, exp_result):
             key='Dog',
             exp_result=True,
         ),
-        AttributeError if not PY2 else None, None, True
+        AttributeError if not DICT_SUPPORTS_HAS_KEY else None, None, True
     ),
 ]