Remove builtins, pickle, StringIO compatibility fixes

pony/orm/core.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function, division
-from pony.py23compat import cmp, unicode, buffer, int_types, builtins
+from pony.py23compat import cmp, unicode, buffer, int_types
 
-import json, re, sys, types, datetime, logging, itertools, warnings, inspect, ast
+import builtins, json, re, sys, types, datetime, logging, itertools, warnings, inspect, ast
 from operator import attrgetter, itemgetter
 from itertools import chain, starmap, repeat
 from time import time

pony/orm/tests/test_core_multiset.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, print_function, division
-from pony.py23compat import pickle
-import unittest
+
+import pickle, unittest
 
 
 from pony.orm.core import *

pony/orm/tests/test_deduplication.py

@@ -1,4 +1,5 @@
-from pony.py23compat import StringIO
+from io import StringIO
+
 from pony.orm import *
 from pony.orm.tests import setup_database, teardown_database
 

pony/orm/tests/test_json.py

@@ -1,6 +1,4 @@
-from pony.py23compat import pickle
-
-import unittest
+import pickle, unittest
 
 from pony.orm import *
 from pony.orm.tests.testutils import raises_exception, raises_if

pony/orm/tests/test_query.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, print_function, division
-from pony.py23compat import pickle
 
-import unittest
+import pickle, unittest
 from datetime import date
 from decimal import Decimal
 

pony/orm/tests/test_show.py

@@ -1,5 +1,3 @@
-from pony.py23compat import StringIO
-
 import io, sys, unittest
 import contextlib
 from decimal import Decimal

pony/py23compat.py

@@ -6,8 +6,6 @@
 PY39 = sys.version_info[:2] >= (3, 9)
 PY310 = sys.version_info[:2] >= (3, 10)
 
-import builtins, pickle
-from io import StringIO
 unicode = str
 buffer = bytes
 int_types = (int,)

pony/utils/utils.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, print_function
-from pony.py23compat import pickle
 
-import ast, io, re, os.path, sys, inspect, types, warnings
+import ast, io, re, os.path, sys, inspect, types, warnings, pickle
 
 from datetime import datetime
 from itertools import count as _count