From 870fabbbbb82d106cbb90f1f562e436800b777ff Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:24:44 -0400 Subject: [PATCH 1/6] Use relative imports --- didyoumean/__init__.py | 2 +- didyoumean/didyoumean_api.py | 2 +- didyoumean/didyoumean_api_tests.py | 4 ++-- didyoumean/didyoumean_internal.py | 4 ++-- didyoumean/didyoumean_internal_tests.py | 6 +++--- didyoumean/didyoumean_re_tests.py | 4 ++-- didyoumean/didyoumean_sugg_tests.py | 6 +++--- didyoumean/readme_examples.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/didyoumean/__init__.py b/didyoumean/__init__.py index 527638f..7fa86da 100644 --- a/didyoumean/__init__.py +++ b/didyoumean/__init__.py @@ -1,2 +1,2 @@ """Empty file. Might grow in the future.""" -import didyoumean_api +from . import didyoumean_api diff --git a/didyoumean/didyoumean_api.py b/didyoumean/didyoumean_api.py index 414b4e3..6a7973f 100644 --- a/didyoumean/didyoumean_api.py +++ b/didyoumean/didyoumean_api.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 """APIs to add suggestions to exceptions.""" -from didyoumean_internal import add_suggestions_to_exception +from .didyoumean_internal import add_suggestions_to_exception import functools import sys diff --git a/didyoumean/didyoumean_api_tests.py b/didyoumean/didyoumean_api_tests.py index db1d9f0..425a701 100755 --- a/didyoumean/didyoumean_api_tests.py +++ b/didyoumean/didyoumean_api_tests.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 """Unit tests for didyoumean APIs.""" -from didyoumean_api import didyoumean_decorator, didyoumean_contextmanager,\ +from .didyoumean_api import didyoumean_decorator, didyoumean_contextmanager,\ didyoumean_postmortem, didyoumean_enablehook, didyoumean_disablehook -from didyoumean_common_tests import TestWithStringFunction,\ +from .didyoumean_common_tests import TestWithStringFunction,\ get_exception, no_exception, NoFileIoError import unittest2 import contextlib diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py index 05f3e36..cb1e41f 100755 --- a/didyoumean/didyoumean_internal.py +++ b/didyoumean/didyoumean_internal.py @@ -2,7 +2,7 @@ """Logic to add suggestions to exceptions.""" import keyword import difflib -import didyoumean_re as re +from . import didyoumean_re as re import itertools import inspect import errno @@ -27,7 +27,7 @@ # https://docs.python.org/2/library/sys.html#sys.modules # - pkgutil.iter_modules # https://docs.python.org/2/library/pkgutil.html#pkgutil.iter_modules -STAND_MODULES = set(['string', 'os', 'sys', 're', 'math', 'random', +STAND_MODULES = set(sys.builtin_module_names) + set(['string', 'os', 'sys', 're', 'math', 'random', 'datetime', 'timeit', 'unittest', 'itertools', 'functools', 'collections', '__future__']) diff --git a/didyoumean/didyoumean_internal_tests.py b/didyoumean/didyoumean_internal_tests.py index 84a0136..095e154 100755 --- a/didyoumean/didyoumean_internal_tests.py +++ b/didyoumean/didyoumean_internal_tests.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 """Unit tests for code in didyoumean_internal.py.""" -from didyoumean_internal import quote, get_suggestion_string,\ +from .didyoumean_internal import quote, get_suggestion_string,\ add_string_to_exception, get_func_by_name,\ get_objects_in_frame, get_subclasses, get_types_for_str,\ get_types_for_str_using_inheritance,\ get_types_for_str_using_names -import didyoumean_common_tests as common -from didyoumean_common_tests import CommonTestOldStyleClass2,\ +from . import didyoumean_common_tests as common +from .didyoumean_common_tests import CommonTestOldStyleClass2,\ CommonTestNewStyleClass2 # to have these 2 in defined names import unittest2 import itertools diff --git a/didyoumean/didyoumean_re_tests.py b/didyoumean/didyoumean_re_tests.py index 01d9b30..52d4856 100755 --- a/didyoumean/didyoumean_re_tests.py +++ b/didyoumean/didyoumean_re_tests.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 """Unit tests for regexps from didyoumean_re.py.""" import unittest2 -import didyoumean_re as re +from . import didyoumean_re as re import sys -from didyoumean_internal import get_subclasses +from .didyoumean_internal import get_subclasses NO_GROUP = ((), dict()) # Various technical flags to check more that meet the eyes in tests diff --git a/didyoumean/didyoumean_sugg_tests.py b/didyoumean/didyoumean_sugg_tests.py index af021e3..b24d6ef 100755 --- a/didyoumean/didyoumean_sugg_tests.py +++ b/didyoumean/didyoumean_sugg_tests.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 """Unit tests for get_suggestions_for_exception.""" -from didyoumean_internal import get_suggestions_for_exception, quote, \ +from .didyoumean_internal import get_suggestions_for_exception, quote, \ STAND_MODULES, AVOID_REC_MSG, \ APPLY_REMOVED_MSG, BUFFER_REMOVED_MSG, CMP_REMOVED_MSG, \ CMP_ARG_REMOVED_MSG, EXC_ATTR_REMOVED_MSG, LONG_REMOVED_MSG, \ MEMVIEW_ADDED_MSG, RELOAD_REMOVED_MSG, STDERR_REMOVED_MSG, \ BREAKPOINT_ADDED_MSG, NO_KEYWORD_ARG_MSG -import didyoumean_common_tests as common +from . import didyoumean_common_tests as common import unittest2 -import didyoumean_re as re +from . import didyoumean_re as re import warnings import sys import math diff --git a/didyoumean/readme_examples.py b/didyoumean/readme_examples.py index 0979b32..24c016e 100755 --- a/didyoumean/readme_examples.py +++ b/didyoumean/readme_examples.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 """Code to generate examples in README.md.""" -from didyoumean_internal import add_suggestions_to_exception -import didyoumean_common_tests as common +from .didyoumean_internal import add_suggestions_to_exception +from . import didyoumean_common_tests as common import os From a1d6c88bf3fa809dcd6c8ac9ffbd864414de5c87 Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:25:00 -0400 Subject: [PATCH 2/6] Run coverage from the current directory. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19cb595..69e47e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_script: - pyflakes . || true script: - - coverage run -m unittest2 discover --start-directory=didyoumean --pattern=*.py + - coverage run -m unittest2 discover --pattern=*.py - python didyoumean/readme_examples.py - pip install . From 463c6d187282aef23eff2ed3af5ae2de64a408a8 Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:32:16 -0400 Subject: [PATCH 3/6] pycodestyle fixes --- didyoumean/didyoumean_internal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py index cb1e41f..fa7d359 100755 --- a/didyoumean/didyoumean_internal.py +++ b/didyoumean/didyoumean_internal.py @@ -27,7 +27,8 @@ # https://docs.python.org/2/library/sys.html#sys.modules # - pkgutil.iter_modules # https://docs.python.org/2/library/pkgutil.html#pkgutil.iter_modules -STAND_MODULES = set(sys.builtin_module_names) + set(['string', 'os', 'sys', 're', 'math', 'random', +STAND_MODULES = set(sys.builtin_module_names) +STAND_MODULES += set(['string', 'os', 'sys', 're', 'math', 'random', 'datetime', 'timeit', 'unittest', 'itertools', 'functools', 'collections', '__future__']) From 92e7391d777471be3fe88b257732c15165c3e899 Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:36:29 -0400 Subject: [PATCH 4/6] spaces? --- didyoumean/didyoumean_internal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py index fa7d359..4a115c3 100755 --- a/didyoumean/didyoumean_internal.py +++ b/didyoumean/didyoumean_internal.py @@ -29,8 +29,8 @@ # https://docs.python.org/2/library/pkgutil.html#pkgutil.iter_modules STAND_MODULES = set(sys.builtin_module_names) STAND_MODULES += set(['string', 'os', 'sys', 're', 'math', 'random', - 'datetime', 'timeit', 'unittest', 'itertools', - 'functools', 'collections', '__future__']) + 'datetime', 'timeit', 'unittest', 'itertools', + 'functools', 'collections', '__future__']) #: Almost synonyms methods that can be confused from one type to another # To be completed From 07c07b2df519e202d676236839af8c9beb102e71 Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:42:27 -0400 Subject: [PATCH 5/6] Add the sets correctly to extend the importerror corrections. --- didyoumean/didyoumean_internal.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py index 4a115c3..bc2ddff 100755 --- a/didyoumean/didyoumean_internal.py +++ b/didyoumean/didyoumean_internal.py @@ -27,10 +27,11 @@ # https://docs.python.org/2/library/sys.html#sys.modules # - pkgutil.iter_modules # https://docs.python.org/2/library/pkgutil.html#pkgutil.iter_modules -STAND_MODULES = set(sys.builtin_module_names) -STAND_MODULES += set(['string', 'os', 'sys', 're', 'math', 'random', +STAND_MODULES = set(['string', 'os', 'sys', 're', 'math', 'random', 'datetime', 'timeit', 'unittest', 'itertools', 'functools', 'collections', '__future__']) + +STAND_MODULES = STAND_MODULES + set(sys.builtin_module_names) #: Almost synonyms methods that can be confused from one type to another # To be completed From 48d7b64866ebfefa30f829dbae8e9f0d7dcc740c Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Sat, 8 Sep 2018 23:48:19 -0400 Subject: [PATCH 6/6] Apparently, I don't know pep8 --- didyoumean/didyoumean_internal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py index bc2ddff..7b201f4 100755 --- a/didyoumean/didyoumean_internal.py +++ b/didyoumean/didyoumean_internal.py @@ -28,9 +28,9 @@ # - pkgutil.iter_modules # https://docs.python.org/2/library/pkgutil.html#pkgutil.iter_modules STAND_MODULES = set(['string', 'os', 'sys', 're', 'math', 'random', - 'datetime', 'timeit', 'unittest', 'itertools', - 'functools', 'collections', '__future__']) - + 'datetime', 'timeit', 'unittest', 'itertools', + 'functools', 'collections', '__future__']) + STAND_MODULES = STAND_MODULES + set(sys.builtin_module_names) #: Almost synonyms methods that can be confused from one type to another