Skip to content
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.

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

Relative imports #35

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
2 changes: 1 addition & 1 deletion didyoumean/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Empty file. Might grow in the future."""
import didyoumean_api
from . import didyoumean_api
2 changes: 1 addition & 1 deletion didyoumean/didyoumean_api.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions didyoumean/didyoumean_api_tests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion didyoumean/didyoumean_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -31,6 +31,8 @@
'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
SYNONYMS_SETS = [
Expand Down
6 changes: 3 additions & 3 deletions didyoumean/didyoumean_internal_tests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions didyoumean/didyoumean_re_tests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions didyoumean/didyoumean_sugg_tests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions didyoumean/readme_examples.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down