diff options
Diffstat (limited to 'sources/shiboken2')
5 files changed, 9 insertions, 38 deletions
diff --git a/sources/shiboken2/libshiboken/embed/embedding_generator.py b/sources/shiboken2/libshiboken/embed/embedding_generator.py index 15f63649b..8fb498008 100644 --- a/sources/shiboken2/libshiboken/embed/embedding_generator.py +++ b/sources/shiboken2/libshiboken/embed/embedding_generator.py @@ -89,7 +89,7 @@ def create_zipfile(limited_api): """ zip_name = "signature.zip" inc_name = "signature_inc.h" - flag = '-b' if sys.version_info >= (3,) else '' + flag = '-b' os.chdir(work_dir) # Remove all left-over py[co] and other files first, in case we use '--reuse-build'. @@ -105,10 +105,7 @@ def create_zipfile(limited_api): os.remove(fpath) # We copy every Python file into this dir, but only for the right version. # For testing in the source dir, we need to filter. - if sys.version_info[0] == 3: - ignore = "backport_inspect.py typing27.py".split() - else: - ignore = "".split() + ignore = [] utils.copydir(os.path.join(source_dir, "shiboken2", "shibokenmodule", "files.dir", "shibokensupport"), os.path.join(work_dir, "shibokensupport"), ignore=ignore, file_filter_function=lambda name, n2: name.endswith(".py")) diff --git a/sources/shiboken2/shibokenmodule/__init__.py.in b/sources/shiboken2/shibokenmodule/__init__.py.in index 6ba8929c9..f99011c7f 100644 --- a/sources/shiboken2/shibokenmodule/__init__.py.in +++ b/sources/shiboken2/shibokenmodule/__init__.py.in @@ -20,9 +20,7 @@ import re import tempfile import keyword import functools -if sys.version_info[0] == 3: - # PyInstaller seems to sometimes fail: - import typing +import typing from .shiboken2 import * diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py index 6ed4c0edd..8ddb75c19 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py @@ -130,10 +130,7 @@ def seterror_argument(args, func_name): return TypeError, msg def check_string_type(s): - if sys.version_info[0] == 3: - return isinstance(s, str) - else: - return isinstance(s, (str, unicode)) + return isinstance(s, str) def make_helptext(func): existing_doc = func.__doc__ diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py index 6cee54680..49c6439b7 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py @@ -153,27 +153,9 @@ def list_modules(message): orig_typing = True -if sys.version_info >= (3,): - import typing - import inspect - inspect.formatannotation = formatannotation -else: - tp_name = "typing" - if tp_name not in sys.modules: - orig_typing = False - from shibokensupport import typing27 as typing - sys.modules[tp_name] = typing - typing.__name__ = tp_name - else: - import typing - import inspect - namespace = inspect.__dict__ - from shibokensupport import backport_inspect as inspect - _doc = inspect.__doc__ - inspect.__dict__.update(namespace) - inspect.__doc__ += _doc - # force inspect to find all attributes. See "heuristic" in pydoc.py! - inspect.__all__ = list(x for x in dir(inspect) if not x.startswith("_")) +import typing +import inspect +inspect.formatannotation = formatannotation # Fix the module names in typing if possible. This is important since # the typing names should be I/O compatible, so that typing.Dict diff --git a/sources/shiboken2/tests/samplebinding/enum_test.py b/sources/shiboken2/tests/samplebinding/enum_test.py index 2ebc8d406..1289dada1 100644 --- a/sources/shiboken2/tests/samplebinding/enum_test.py +++ b/sources/shiboken2/tests/samplebinding/enum_test.py @@ -46,11 +46,8 @@ import sample from sample import SampleNamespace, ObjectType, Event def createTempFile(): - if sys.version_info >= (2, 6): - import tempfile - return tempfile.SpooledTemporaryFile(mode='rw') - else: - return os.tmpfile() + import tempfile + return tempfile.SpooledTemporaryFile(mode='rw') class EnumTest(unittest.TestCase): '''Test case for Python representation of C++ enums.''' |