Drop support for EOL Python

hugovk · Byron · commit 54a34e897658 · 2018-10-13T12:51:18.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,6 @@
 language: python
 python:
-  # These versions are unsupported by travis, even though smmap claims to still support these outdated versions
-  # - 2.4
-  # - 2.5
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
 install:
diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@ Although memory maps have many advantages, they represent a very limited system
 
 * **System resources (file-handles) are likely to be leaked!** This is due to the library authors reliance on a deterministic `__del__()` destructor.
 * The memory access is read-only by design.
-* In python below 2.6, memory maps will be created in compatibility mode which works, but creates inefficient memory mappings as they always start at offset 0.
 
 
 ## Overview
@@ -34,7 +33,7 @@ For performance critical 64 bit applications, a simplified version of memory map
 
 ## Prerequisites
 
-* Python 2.4, 2.5, 2.6, 2.7 or 3.3
+* Python 2.7 or 3.4+
 * OSX, Windows or Linux
 
 The package was tested on all of the previously mentioned configurations.
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
@@ -22,7 +22,7 @@ For performance critical 64 bit applications, a simplified version of memory map
 #############
 Prerequisites
 #############
-* Python 2.4, 2.5, 2.6, 2.7 or 3.3
+* Python 2.7 or 3.4+
 * OSX, Windows or Linux
 
 The package was tested on all of the previously mentioned configurations.
@@ -31,7 +31,6 @@ The package was tested on all of the previously mentioned configurations.
 Limitations
 ###########
 * The memory access is read-only by design.
-* In python below 2.6, memory maps will be created in compatibility mode which works, but creates inefficient memory mappings as they always start at offset 0.
 
 ################
 Installing smmap
diff --git a/setup.py b/setup.py
@@ -13,12 +13,12 @@
 if os.path.exists("README.md"):
     long_description = codecs.open('README.md', "r", "utf-8").read()
 else:
-    long_description = "See http://github.com/gitpython-developers/smmap"
+    long_description = "See https://github.com/gitpython-developers/smmap"
 
 setup(
     name="smmap2",
     version=smmap.__version__,
-    description="A pure python implementation of a sliding window memory map manager",
+    description="A pure Python implementation of a sliding window memory map manager",
     author=smmap.__author__,
     author_email=smmap.__contact__,
     url=smmap.__homepage__,
@@ -45,10 +45,8 @@
         "Operating System :: MacOS :: MacOS X",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
diff --git a/smmap/buf.py b/smmap/buf.py
@@ -88,35 +88,20 @@ def __getslice__(self, i, j):
             # It's fastest to keep tokens and join later, especially in py3, which was 7 times slower
             # in the previous iteration of this code
             pyvers = sys.version_info[:2]
-            if (3, 0) <= pyvers <= (3, 3):
-                # Memory view cannot be joined below python 3.4 ...
-                out = bytes()
-                while l:
-                    c.use_region(ofs, l)
-                    assert c.is_valid()
-                    d = c.buffer()[:l]
-                    ofs += len(d)
-                    l -= len(d)
-                    # This is slower than the join ... but what can we do ...
-                    out += d
-                    del(d)
-                # END while there are bytes to read
-                return out
-            else:
-                md = list()
-                while l:
-                    c.use_region(ofs, l)
-                    assert c.is_valid()
-                    d = c.buffer()[:l]
-                    ofs += len(d)
-                    l -= len(d)
-                    # Make sure we don't keep references, as c.use_region() might attempt to free resources, but
-                    # can't unless we use pure bytes
-                    if hasattr(d, 'tobytes'):
-                        d = d.tobytes()
-                    md.append(d)
-                # END while there are bytes to read
-                return bytes().join(md)
+            md = list()
+            while l:
+                c.use_region(ofs, l)
+                assert c.is_valid()
+                d = c.buffer()[:l]
+                ofs += len(d)
+                l -= len(d)
+                # Make sure we don't keep references, as c.use_region() might attempt to free resources, but
+                # can't unless we use pure bytes
+                if hasattr(d, 'tobytes'):
+                    d = d.tobytes()
+                md.append(d)
+            # END while there are bytes to read
+            return bytes().join(md)
         # END fast or slow path
     #{ Interface
 
diff --git a/smmap/util.py b/smmap/util.py
@@ -3,13 +3,7 @@
 import sys
 
 from mmap import mmap, ACCESS_READ
-try:
-    from mmap import ALLOCATIONGRANULARITY
-except ImportError:
-    # in python pre 2.6, the ALLOCATIONGRANULARITY does not exist as it is mainly
-    # useful for aligning the offset. The offset argument doesn't exist there though
-    from mmap import PAGESIZE as ALLOCATIONGRANULARITY
-# END handle pythons missing quality assurance
+from mmap import ALLOCATIONGRANULARITY
 
 __all__ = ["align_to_mmap", "is_64_bit", "buffer",
            "MapWindow", "MapRegion", "MapRegionList", "ALLOCATIONGRANULARITY"]
@@ -116,11 +110,6 @@ class MapRegion(object):
         '_size',  # cached size of our memory map
         '__weakref__'
     ]
-    _need_compat_layer = sys.version_info[:2] < (2, 6)
-
-    if _need_compat_layer:
-        __slots__.append('_mfb')        # mapped memory buffer to provide offset
-    # END handle additional slot
 
     #{ Configuration
     #} END configuration
@@ -147,11 +136,6 @@ def __init__(self, path_or_fd, ofs, size, flags=0):
             kwargs = dict(access=ACCESS_READ, offset=ofs)
             corrected_size = size
             sizeofs = ofs
-            if self._need_compat_layer:
-                del(kwargs['offset'])
-                corrected_size += ofs
-                sizeofs = 0
-            # END handle python not supporting offset ! Arg
 
             # have to correct size, otherwise (instead of the c version) it will
             # bark that the size is too large ... many extra file accesses because
@@ -161,10 +145,6 @@ def __init__(self, path_or_fd, ofs, size, flags=0):
             # END handle memory mode
 
             self._size = len(self._mf)
-
-            if self._need_compat_layer:
-                self._mfb = buffer(self._mf, ofs, self._size)
-            # END handle buffer wrapping
         finally:
             if isinstance(path_or_fd, string_types()):
                 os.close(fd)
@@ -224,22 +204,6 @@ def release(self):
         """Release all resources this instance might hold. Must only be called if there usage_count() is zero"""
         self._mf.close()
 
-    # re-define all methods which need offset adjustments in compatibility mode
-    if _need_compat_layer:
-        def size(self):
-            return self._size - self._b
-
-        def ofs_end(self):
-            # always the size - we are as large as it gets
-            return self._size
-
-        def buffer(self):
-            return self._mfb
-
-        def includes_ofs(self, ofs):
-            return self._b <= ofs < self._size
-    # END handle compat layer
-
     #} END interface
 
 
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = flake8, py26, py27, py33, py34
+envlist = flake8, py27, py34
 
 [testenv]
 commands = nosetests {posargs:--with-coverage --cover-package=smmap}
