Kickstart support drop for Python < 3.7

dill/__diff.py

@@ -10,18 +10,15 @@
 Module to show if an object has changed since it was memorised
 """
 
+import builtins
 import os
 import sys
 import types
 try:
     import numpy
     HAS_NUMPY = True
-except:
-    HAS_NUMPY = False
-try:
-    import builtins
 except ImportError:
-    import __builtin__ as builtins
+    HAS_NUMPY = False
 
 # pypy doesn't use reference counting
 getrefcount = getattr(sys, 'getrefcount', lambda x:0)
@@ -44,10 +41,7 @@ def get_attrs(obj):
     if type(obj) in builtins_types \
        or type(obj) is type and obj in builtins_types:
         return
-    try:
-        return obj.__dict__
-    except:
-        return
+    return getattr(obj, '__dict__', None)
 
 
 def get_seq(obj, cache={str: False, frozenset: False, list: True, set: True,

dill/__init__.py

@@ -42,27 +42,28 @@
 
 ``dill`` is part of ``pathos``, a python framework for heterogeneous computing.
 ``dill`` is in active development, so any user feedback, bug reports, comments,
-or suggestions are highly appreciated.  A list of issues is located at https://github.com/uqfoundation/dill/issues, with a legacy list maintained at https://uqfoundation.github.io/project/pathos/query.
+or suggestions are highly appreciated.  A list of issues is located at
+https://github.com/uqfoundation/dill/issues, with a legacy list maintained at
+https://uqfoundation.github.io/project/pathos/query.
 
 
 Major Features
 ==============
 
 ``dill`` can pickle the following standard types:
 
-    - none, type, bool, int, long, float, complex, str, unicode,
+    - none, type, bool, int, float, complex, bytes, str,
     - tuple, list, dict, file, buffer, builtin,
-    - both old and new style classes,
-    - instances of old and new style classes,
+    - python classes, namedtuples, dataclasses, metaclasses,
+    - instances of classes,
     - set, frozenset, array, functions, exceptions
 
 ``dill`` can also pickle more 'exotic' standard types:
 
     - functions with yields, nested functions, lambdas,
     - cell, method, unboundmethod, module, code, methodwrapper,
-    - dictproxy, methoddescriptor, getsetdescriptor, memberdescriptor,
-    - wrapperdescriptor, xrange, slice,
-    - notimplemented, ellipsis, quit
+    - methoddescriptor, getsetdescriptor, memberdescriptor, wrapperdescriptor,
+    - dictproxy, slice, notimplemented, ellipsis, quit
 
 ``dill`` cannot yet pickle these standard types:
 
@@ -148,7 +149,7 @@
 as keyword arguments to several ``dill`` functions:
 
 * with *protocol*, the pickle protocol level can be set. This uses the
-  same value as the ``pickle`` module, *HIGHEST_PROTOCOL* or *DEFAULT_PROTOCOL*.
+  same value as the ``pickle`` module, *DEFAULT_PROTOCOL*.
 * with *byref=True*, ``dill`` to behave a lot more like pickle with
   certain objects (like modules) pickled by reference as opposed to
   attempting to pickle the object itself.
@@ -296,23 +297,9 @@
 # make sure "trace" is turned off
 detect.trace(False)
 
-try:
-    from importlib import reload
-except ImportError:
-    try:
-        from imp import reload
-    except ImportError:
-        pass
-
-# put the objects in order, if possible
-try:
-    from collections import OrderedDict as odict
-except ImportError:
-    try:
-        from ordereddict import OrderedDict as odict
-    except ImportError:
-        odict = dict
-objects = odict()
+from importlib import reload
+
+objects = {}
 # local import of dill._objects
 #from . import _objects
 #objects.update(_objects.succeeds)
@@ -373,7 +360,6 @@ def extend(use_dill=True):
     return
 
 extend()
-del odict
 
 
 def license():