diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-12 01:01:17 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-12 01:01:17 +0100 |
| commit | 19b992a862d0665bf9b543c32ee76763a9834f48 (patch) | |
| tree | bd6ab77dff45410dff5e0368dea2e7198f122355 /tests/basics | |
| parent | b96c7c03ca790f62e4f9409b019290946f622aa7 (diff) | |
| parent | 42453dc98e95270d3802baf3d70d60c7ecabf162 (diff) | |
| download | micropython-19b992a862d0665bf9b543c32ee76763a9834f48.tar.gz micropython-19b992a862d0665bf9b543c32ee76763a9834f48.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'tests/basics')
| -rw-r--r-- | tests/basics/import-pkg4.py | 2 | ||||
| -rw-r--r-- | tests/basics/pkg2/__init__.py | 1 | ||||
| -rw-r--r-- | tests/basics/pkg2/mod1.py | 1 | ||||
| -rw-r--r-- | tests/basics/pkg2/mod2.py | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/tests/basics/import-pkg4.py b/tests/basics/import-pkg4.py new file mode 100644 index 0000000000..90b6f2e0ee --- /dev/null +++ b/tests/basics/import-pkg4.py @@ -0,0 +1,2 @@ +# Testing that "recursive" imports (pkg2/__init__.py imports from pkg2) work +import pkg2 diff --git a/tests/basics/pkg2/__init__.py b/tests/basics/pkg2/__init__.py new file mode 100644 index 0000000000..101ac7d400 --- /dev/null +++ b/tests/basics/pkg2/__init__.py @@ -0,0 +1 @@ +from pkg2 import mod1 diff --git a/tests/basics/pkg2/mod1.py b/tests/basics/pkg2/mod1.py new file mode 100644 index 0000000000..03754a45f6 --- /dev/null +++ b/tests/basics/pkg2/mod1.py @@ -0,0 +1 @@ +from pkg2 import mod2 diff --git a/tests/basics/pkg2/mod2.py b/tests/basics/pkg2/mod2.py new file mode 100644 index 0000000000..97dadcde46 --- /dev/null +++ b/tests/basics/pkg2/mod2.py @@ -0,0 +1 @@ +print("in mod2") |