diff options
| author | Damien George | 2014-04-12 17:55:32 +0100 |
|---|---|---|
| committer | Damien George | 2014-04-12 17:55:32 +0100 |
| commit | 0a4c210586e0e5f8de4cf87116edbed9070a4810 (patch) | |
| tree | ee9eb28038e16158c5832081b7364b7e18e6f332 /tests | |
| parent | a26dc509681ef766ddc3d72646abd3befc12f573 (diff) | |
| parent | a5afc9009fedbe9a06f49d46a1c7e2251a84a549 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basics/import-pkg5.py | 6 | ||||
| -rw-r--r-- | tests/basics/pkg3/__init__.py | 1 | ||||
| -rw-r--r-- | tests/basics/pkg3/mod1.py | 2 | ||||
| -rw-r--r-- | tests/basics/pkg3/mod2.py | 5 | ||||
| -rw-r--r-- | tests/basics/pkg3/subpkg1/__init__.py | 1 | ||||
| -rw-r--r-- | tests/basics/pkg3/subpkg1/mod1.py | 2 |
6 files changed, 17 insertions, 0 deletions
diff --git a/tests/basics/import-pkg5.py b/tests/basics/import-pkg5.py new file mode 100644 index 000000000..aa74bb45f --- /dev/null +++ b/tests/basics/import-pkg5.py @@ -0,0 +1,6 @@ +# This tests relative imports as used in pkg3 +import pkg3 +import pkg3.mod1 +import pkg3.subpkg1.mod1 + +pkg3.subpkg1.mod1.foo() diff --git a/tests/basics/pkg3/__init__.py b/tests/basics/pkg3/__init__.py new file mode 100644 index 000000000..8b92fa996 --- /dev/null +++ b/tests/basics/pkg3/__init__.py @@ -0,0 +1 @@ +print("pkg __name__:", __name__) diff --git a/tests/basics/pkg3/mod1.py b/tests/basics/pkg3/mod1.py new file mode 100644 index 000000000..28a0f5bf1 --- /dev/null +++ b/tests/basics/pkg3/mod1.py @@ -0,0 +1,2 @@ +print("mod1 __name__:", __name__) +from . import mod2 diff --git a/tests/basics/pkg3/mod2.py b/tests/basics/pkg3/mod2.py new file mode 100644 index 000000000..67f43bad5 --- /dev/null +++ b/tests/basics/pkg3/mod2.py @@ -0,0 +1,5 @@ +print("mod2 __name__:", __name__) +print("in mod2") + +def foo(): + print("mod2.foo()") diff --git a/tests/basics/pkg3/subpkg1/__init__.py b/tests/basics/pkg3/subpkg1/__init__.py new file mode 100644 index 000000000..72b542395 --- /dev/null +++ b/tests/basics/pkg3/subpkg1/__init__.py @@ -0,0 +1 @@ +print("subpkg1 __name__:", __name__) diff --git a/tests/basics/pkg3/subpkg1/mod1.py b/tests/basics/pkg3/subpkg1/mod1.py new file mode 100644 index 000000000..7a2ae44b5 --- /dev/null +++ b/tests/basics/pkg3/subpkg1/mod1.py @@ -0,0 +1,2 @@ +print("subpkg1.mod1 __name__:", __name__) +from ..mod2 import foo |