From 7d30eb87f768ebfdc95859b04a2f762c2c903b72 Mon Sep 17 00:00:00 2001
From: FedeClaudi <federicoclaudi@protonmail.com>
Date: Sun, 1 Nov 2020 08:53:34 +0000
Subject: [PATCH 1/3] fixed paths for pip install

---
 .gitignore                                    |  2 ++
 didyoumean/__init__.py                        |  3 +-
 didyoumean/didyoumean_api.py                  |  2 +-
 didyoumean/didyoumean_api_tests.py            | 17 ++++++++---
 didyoumean/didyoumean_internal.py             |  3 +-
 didyoumean/didyoumean_internal_tests.py       | 27 +++++++++++-------
 didyoumean/didyoumean_re_tests.py             |  6 ++--
 didyoumean/didyoumean_sugg_tests.py           | 28 +++++++++++++------
 .../readme_examples.py => readme_examples.py  |  4 +--
 9 files changed, 62 insertions(+), 30 deletions(-)
 rename didyoumean/readme_examples.py => readme_examples.py (98%)

diff --git a/.gitignore b/.gitignore
index db4561e..3b53ecb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.vscode
+workspace.py
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/didyoumean/__init__.py b/didyoumean/__init__.py
index 527638f..6f9b3ab 100644
--- a/didyoumean/__init__.py
+++ b/didyoumean/__init__.py
@@ -1,2 +1,3 @@
 """Empty file. Might grow in the future."""
-import didyoumean_api
+from didyoumean import didyoumean_api
+from didyoumean.didyoumean_internal import add_suggestions_to_exception
\ No newline at end of file
diff --git a/didyoumean/didyoumean_api.py b/didyoumean/didyoumean_api.py
index 414b4e3..a213ca8 100644
--- a/didyoumean/didyoumean_api.py
+++ b/didyoumean/didyoumean_api.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8
 """APIs to add suggestions to exceptions."""
-from didyoumean_internal import add_suggestions_to_exception
 import functools
 import sys
+from .didyoumean_internal import add_suggestions_to_exception
 
 
 def didyoumean_decorator(func):
diff --git a/didyoumean/didyoumean_api_tests.py b/didyoumean/didyoumean_api_tests.py
index 51264a3..d300128 100755
--- a/didyoumean/didyoumean_api_tests.py
+++ b/didyoumean/didyoumean_api_tests.py
@@ -1,13 +1,22 @@
 # -*- coding: utf-8
 """Unit tests for didyoumean APIs."""
-from didyoumean_api import didyoumean_decorator, didyoumean_contextmanager,\
-    didyoumean_postmortem, didyoumean_enablehook, didyoumean_disablehook
-from didyoumean_common_tests import TestWithStringFunction,\
-    get_exception, no_exception, NoFileIoError, unittest_module
 import contextlib
 import sys
 import os
 
+from .didyoumean_api import (
+    didyoumean_decorator,
+    didyoumean_contextmanager,
+    didyoumean_postmortem,
+    didyoumean_enablehook,
+    didyoumean_disablehook)
+from .didyoumean_common_tests import (
+    TestWithStringFunction,
+    get_exception,
+    no_exception,
+    NoFileIoError,
+    unittest_module
+    )
 
 class ApiTest(TestWithStringFunction):
     """Tests about the didyoumean APIs.
diff --git a/didyoumean/didyoumean_internal.py b/didyoumean/didyoumean_internal.py
index b034f1a..563f9f7 100755
--- a/didyoumean/didyoumean_internal.py
+++ b/didyoumean/didyoumean_internal.py
@@ -2,7 +2,6 @@
 """Logic to add suggestions to exceptions."""
 import keyword
 import difflib
-import didyoumean_re as re
 import itertools
 import inspect
 import errno
@@ -10,6 +9,8 @@
 import sys
 from collections import namedtuple
 
+from didyoumean import didyoumean_re as re
+
 
 #: Standard modules we'll consider while searching for symbols, for instance:
 #  - NameError and the name is an attribute of a std (imported or not) module
diff --git a/didyoumean/didyoumean_internal_tests.py b/didyoumean/didyoumean_internal_tests.py
index dd9e007..446fcaf 100755
--- a/didyoumean/didyoumean_internal_tests.py
+++ b/didyoumean/didyoumean_internal_tests.py
@@ -1,17 +1,24 @@
 # -*- coding: utf-8
 """Unit tests for code in didyoumean_internal.py."""
-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 unittest_module,\
-    CommonTestOldStyleClass2,\
-    CommonTestNewStyleClass2  # to have these 2 in defined names
 import itertools
 import sys
-
+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
+)
+from didyoumean import didyoumean_common_tests as common
+from .didyoumean_common_tests import (
+    unittest_module,
+    CommonTestOldStyleClass2,
+    CommonTestNewStyleClass2 
+)
 
 OLD_CLASS_SUPPORT = sys.version_info >= (3, 0)
 IS_PYPY = hasattr(sys, "pypy_translation_info")
diff --git a/didyoumean/didyoumean_re_tests.py b/didyoumean/didyoumean_re_tests.py
index c2df00e..d440398 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 didyoumean_re as re
 import sys
-from didyoumean_internal import get_subclasses
-from didyoumean_common_tests import unittest_module
+from .didyoumean_internal import get_subclasses
+from .didyoumean_common_tests import unittest_module
+from didyoumean import didyoumean_re as re
 
 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 dd94dcc..a2a712e 100755
--- a/didyoumean/didyoumean_sugg_tests.py
+++ b/didyoumean/didyoumean_sugg_tests.py
@@ -1,13 +1,5 @@
 # -*- coding: utf-8
 """Unit tests for get_suggestions_for_exception."""
-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, COMMA_INSTEAD_OF_PERIOD_MSG
-import didyoumean_common_tests as common
-import didyoumean_re as re
 import warnings
 import sys
 import math
@@ -15,6 +7,26 @@
 import tempfile
 from shutil import rmtree
 
+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,
+    COMMA_INSTEAD_OF_PERIOD_MSG
+    )
+import .didyoumean_common_tests as common
+import .didyoumean_re as re
 
 unittest_module = common.unittest_module
 
diff --git a/didyoumean/readme_examples.py b/readme_examples.py
similarity index 98%
rename from didyoumean/readme_examples.py
rename to readme_examples.py
index ab14466..c789211 100755
--- a/didyoumean/readme_examples.py
+++ b/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 import add_suggestions_to_exception
+from didyoumean import didyoumean_common_tests as common
 import os
 
 

From f53c2ba13391b8d4fa4c4aa529f27a234f577055 Mon Sep 17 00:00:00 2001
From: FedeClaudi <federicoclaudi@protonmail.com>
Date: Sun, 1 Nov 2020 10:42:41 +0000
Subject: [PATCH 2/3] bump

---
 didyoumean/__init__.py                  | 3 ++-
 didyoumean/didyoumean_api_tests.py      | 1 +
 didyoumean/didyoumean_internal_tests.py | 4 ++--
 didyoumean/didyoumean_sugg_tests.py     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/didyoumean/__init__.py b/didyoumean/__init__.py
index 6f9b3ab..2008f6d 100644
--- a/didyoumean/__init__.py
+++ b/didyoumean/__init__.py
@@ -1,3 +1,4 @@
 """Empty file. Might grow in the future."""
 from didyoumean import didyoumean_api
-from didyoumean.didyoumean_internal import add_suggestions_to_exception
\ No newline at end of file
+from didyoumean.didyoumean_internal import add_suggestions_to_exception
+
diff --git a/didyoumean/didyoumean_api_tests.py b/didyoumean/didyoumean_api_tests.py
index d300128..3a83b5d 100755
--- a/didyoumean/didyoumean_api_tests.py
+++ b/didyoumean/didyoumean_api_tests.py
@@ -18,6 +18,7 @@
     unittest_module
     )
 
+
 class ApiTest(TestWithStringFunction):
     """Tests about the didyoumean APIs.
 
diff --git a/didyoumean/didyoumean_internal_tests.py b/didyoumean/didyoumean_internal_tests.py
index 446fcaf..55e6772 100755
--- a/didyoumean/didyoumean_internal_tests.py
+++ b/didyoumean/didyoumean_internal_tests.py
@@ -11,13 +11,13 @@
     get_subclasses,
     get_types_for_str,
     get_types_for_str_using_inheritance,
-    get_types_for_str_using_names
+    get_types_for_str_using_names,
 )
 from didyoumean import didyoumean_common_tests as common
 from .didyoumean_common_tests import (
     unittest_module,
     CommonTestOldStyleClass2,
-    CommonTestNewStyleClass2 
+    CommonTestNewStyleClass2,
 )
 
 OLD_CLASS_SUPPORT = sys.version_info >= (3, 0)
diff --git a/didyoumean/didyoumean_sugg_tests.py b/didyoumean/didyoumean_sugg_tests.py
index a2a712e..c685a56 100755
--- a/didyoumean/didyoumean_sugg_tests.py
+++ b/didyoumean/didyoumean_sugg_tests.py
@@ -8,7 +8,7 @@
 from shutil import rmtree
 
 from .didyoumean_internal import (
-    get_suggestions_for_exception, 
+    get_suggestions_for_exception,
     quote,
     STAND_MODULES,
     AVOID_REC_MSG,

From 232d63061091ba418732fb90c43f7e4951458311 Mon Sep 17 00:00:00 2001
From: FedeClaudi <federicoclaudi@protonmail.com>
Date: Sun, 1 Nov 2020 10:54:37 +0000
Subject: [PATCH 3/3] bump

---
 didyoumean/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/didyoumean/__init__.py b/didyoumean/__init__.py
index 2008f6d..03094f9 100644
--- a/didyoumean/__init__.py
+++ b/didyoumean/__init__.py
@@ -1,4 +1,3 @@
 """Empty file. Might grow in the future."""
 from didyoumean import didyoumean_api
 from didyoumean.didyoumean_internal import add_suggestions_to_exception
-