Skip to content

Kickstart support drop for Python < 3.7 #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 1, 2022
Merged

Kickstart support drop for Python < 3.7 #499

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fc46578
Kickstart support drop for Python < 3.7
leogama Jun 4, 2022
5e33b75
Merge branch 'master' into drop-2.7-3.6 with clean-up changes
leogama Jun 19, 2022
2863597
convert single function defined via exec() due to Python2/3 differences
leogama Jun 21, 2022
71fcc7b
drop 'from __future__ import print_function' statements
leogama Jun 21, 2022
bc87125
remove conditional imports due to Python 2 and old Python 3
leogama Jun 21, 2022
1f8db14
substitute bare 'except' clauses by 'except Exception' or more specif…
leogama Jun 21, 2022
5488acc
split module imports into separated lines
leogama Jun 24, 2022
0df4aca
idem, but for test files
leogama Jun 24, 2022
d8727dc
review: adjustments
leogama Jun 24, 2022
d05acd0
tests: get a default Python 3 executable
leogama Jun 24, 2022
6221f62
update module docs
leogama Jun 24, 2022
de6a191
update README
leogama Jun 24, 2022
af4e4ee
review: corrections
leogama Jun 24, 2022
aa67088
Merge branch 'master' into drop-2.7-3.6
leogama Jun 26, 2022
ef2ed16
Merge branch 'master' into 'drop-2.7-3.6'
leogama Jul 1, 2022
42fa293
remove unicode prefix from strings in docs/source/conf.py
leogama Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions dill/__diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@
Module to show if an object has changed since it was memorised
"""

import os
import sys
import types
import builtins, os, sys, 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)
Expand All @@ -44,10 +38,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,
Expand Down
21 changes: 3 additions & 18 deletions dill/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,23 +296,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)
Expand Down Expand Up @@ -373,7 +359,6 @@ def extend(use_dill=True):
return

extend()
del odict


def license():
Expand Down
Loading