Merge lp:~cjwatson/storm/drop-pre-2.6 into lp:storm

[Colin Watson]

Remove support for Python < 2.6.

Python 2.5 reached EOL in 2011; there's really no need to carry around compatibility cruft for it or for earlier versions any more.

(Indeed, 2.6 is also pretty dead, and I don't have a good way to test that Storm still works on it at the moment; but we don't have any compatibility code for it, so it isn't getting in the way regardless.)

[Adam Collard (adam-collard)]

Approved with one inline cleanup suggestion

review: Approve

[lp:~cjwatson/storm/drop-pre-2.6]

494. By Colin Watson on 2019-06-05

Remove now-useless JSONVariable.__init__.

=== modified file 'NEWS'
--- NEWS	2019-05-31 15:27:10 +0000
+++ NEWS	2019-06-05 09:49:59 +0000
@@ -21,6 +21,7 @@
 
 - Removed Django support, storm.django is no more.
 - Removed MySQL support.
+- Removed support for Python < 2.6.
 
 0.20 (2013-06-28)
 =================

=== modified file 'storm/cextensions.c'
--- storm/cextensions.c	2019-04-08 07:36:11 +0000
+++ storm/cextensions.c	2019-06-05 09:49:59 +0000
@@ -24,13 +24,6 @@
 #include <structmember.h>
 
 
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#endif
-
-
 #define CATCH(error_value, expression) \
         do { \
             if ((expression) == error_value) {\
@@ -47,56 +40,6 @@
         } while(0)
 
 
-/* Python 2.4 does not include the PySet_* API, so provide a minimal
-   implementation for the calls we care about. */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PySet_GET_SIZE)
-#  define PySet_GET_SIZE(so) \
-     ((PyDictObject *)((PySetObject *)so)->data)->ma_used
-static PyObject *
-PySet_New(PyObject *p)
-{
-    return PyObject_CallObject((PyObject *)&PySet_Type, NULL);
-}
-
-static int
-PySet_Add(PyObject *set, PyObject *key)
-{
-    PyObject *dict;
-
-    if (!PyType_IsSubtype(set->ob_type, &PySet_Type)) {
-        PyErr_BadInternalCall();
-        return -1;
-    }
-    dict = ((PySetObject *)set)->data;
-    return PyDict_SetItem(dict, key, Py_True);
-}
-
-static int
-PySet_Discard(PyObject *set, PyObject *key)
-{
-    PyObject *dict;
-    int result;
-
-    if (!PyType_IsSubtype(set->ob_type, &PySet_Type)) {
-        PyErr_BadInternalCall();
-        return -1;
-    }
-    dict = ((PySetObject *)set)->data;
-    result = PyDict_DelItem(dict, key);
-    if (result == 0) {
-        /* key found and removed */
-        result = 1;
-    } else {
-        if (PyErr_ExceptionMatches(PyExc_KeyError)) {
-            /* key not found */
-            PyErr_Clear();
-            result = 0;
-        }
-    }
-    return result;
-}
-#endif
-
 static PyObject *Undef = NULL;
 static PyObject *LazyValue = NULL;
 static PyObject *raise_none_error = NULL;

=== modified file 'storm/compat.py'
--- storm/compat.py	2011-09-07 14:31:09 +0000
+++ storm/compat.py	2019-06-05 09:49:59 +0000
@@ -22,10 +22,4 @@
 __all__ = ["json"]
 
 
-try:
-    import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        json = None
+import json

=== modified file 'storm/variables.py'
--- storm/variables.py	2019-04-07 16:20:40 +0000
+++ storm/variables.py	2019-06-05 09:49:59 +0000
@@ -20,12 +20,10 @@
 #
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
+from functools import partial
 import cPickle as pickle
 import re
-try:
-    import uuid
-except ImportError:
-    uuid = None
+import uuid
 import weakref
 
 from storm.compat import json
@@ -75,22 +73,7 @@
         raise NoneError("None isn't acceptable as a value for %s" % name)
 
 
-def VariableFactory(cls, **old_kwargs):
-    """Build cls with kwargs of constructor updated by kwargs of call.
-
-    This is really an implementation of partial/curry functions, and
-    is replaced by 'partial' when 2.5+ is in use.
-    """
-    def variable_factory(**new_kwargs):
-        kwargs = old_kwargs.copy()
-        kwargs.update(new_kwargs)
-        return cls(**kwargs)
-    return variable_factory
-
-try:
-    from functools import partial as VariableFactory
-except ImportError:
-    pass
+VariableFactory = partial
 
 
 class Variable(object):
@@ -502,7 +485,6 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        assert uuid is not None, "The uuid module was not found."
         if from_db and isinstance(value, basestring):
             value = uuid.UUID(value)
         elif not isinstance(value, uuid.UUID):
@@ -628,11 +610,6 @@
 
     __slots__ = ()
 
-    def __init__(self, *args, **kwargs):
-        assert json is not None, (
-            "Neither the json nor the simplejson module was found.")
-        super(JSONVariable, self).__init__(*args, **kwargs)
-
     def _loads(self, value):
         if not isinstance(value, unicode):
             raise TypeError(

=== modified file 'tests/helper.py'
--- tests/helper.py	2012-04-04 23:42:51 +0000
+++ tests/helper.py	2019-06-05 09:49:59 +0000
@@ -52,12 +52,7 @@
 
     @property
     def _testMethod(self):
-        try:
-            name = self._testMethodName
-        except AttributeError:
-            # On Python < 2.5
-            name = self._TestCase__testMethodName
-        return getattr(self, name)
+        return getattr(self, self._testMethodName)
 
     def run(self, result=None):
         # Skip if is_supported() does not return True.

=== modified file 'tests/mocker.py'
--- tests/mocker.py	2019-05-30 13:39:54 +0000
+++ tests/mocker.py	2019-06-05 09:49:59 +0000
@@ -8,16 +8,11 @@
 import unittest
 import inspect
 import shutil
-import types
 import sys
 import os
 import gc
 
 
-if sys.version_info < (2, 4):
-    from sets import Set as set # pragma: nocover
-
-
 __all__ = ["Mocker", "expect", "IS", "CONTAINS", "IN", "MATCH",
            "ANY", "ARGS", "KWARGS"]
 
@@ -305,10 +300,6 @@
     assertNotApproximates = failIfApproximates
     assertMethodsMatch = failUnlessMethodsMatch
 
-    # The following are missing in Python < 2.4.
-    assertTrue = unittest.TestCase.failUnless
-    assertFalse = unittest.TestCase.failIf
-
     # The following is provided for compatibility with Twisted's trial.
     assertIdentical = assertIs
     assertNotIdentical = assertIsNot

=== modified file 'tests/properties.py'
--- tests/properties.py	2011-09-07 14:04:04 +0000
+++ tests/properties.py	2019-06-05 09:49:59 +0000
@@ -21,10 +21,7 @@
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal as decimal
 import gc
-try:
-    import uuid
-except ImportError:
-    uuid = None
+import uuid
 
 from storm.compat import json
 from storm.exceptions import NoneError, PropertyPathError
@@ -556,10 +553,6 @@
         self.assertRaises(TypeError, setattr, self.obj, "prop1", object())
 
     def test_uuid(self):
-        # Skip test if uuid module is not available.
-        if uuid is None:
-            return
-
         value1 = uuid.UUID("{0609f76b-878f-4546-baf5-c1b135e8de72}")
         value2 = uuid.UUID("{c9703f9d-0abb-47d7-a793-8f90f1b98d5e}")
         self.setup(UUID, default=value1, allow_none=False)

=== modified file 'tests/variables.py'
--- tests/variables.py	2019-05-30 13:39:54 +0000
+++ tests/variables.py	2019-06-05 09:49:59 +0000
@@ -23,10 +23,7 @@
 import cPickle as pickle
 import gc
 import weakref
-try:
-    import uuid
-except ImportError:
-    uuid = None
+import uuid
 
 from storm.compat import json
 from storm.exceptions import NoneError
@@ -787,9 +784,6 @@
 
 class UUIDVariableTest(TestHelper):
 
-    def is_supported(self):
-        return uuid is not None
-
     def test_get_set(self):
         value = uuid.UUID("{0609f76b-878f-4546-baf5-c1b135e8de72}")
 
@@ -913,7 +907,7 @@
 
     def test_unicode_to_db(self):
         # JSONVariable._dumps() works around unicode/str handling issues in
-        # simplejson/json.
+        # json.
         variable = self.variable_type()
         variable.set({u"a": 1})
         self.assertTrue(isinstance(variable.get(to_db=True), unicode))