From 3ba5b9f3a58a58c19120e0d73dcd70ef79fd813e Mon Sep 17 00:00:00 2001 From: htgoebel Date: Tue, 5 Aug 2008 17:25:44 +0000 Subject: [PATCH] Enhanced testcase for relative import. git-svn-id: http://svn.pyinstaller.org/trunk@525 8dd32b29-ccff-0310-8a9a-9233e24343b1 --- buildtests/relimp/B/C.py | 1 + buildtests/relimp/B/D.py | 3 +++ buildtests/relimp/relimp/relimp2.py | 9 +++++++-- buildtests/relimp/relimp/relimp3.py | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 buildtests/relimp/relimp/relimp3.py diff --git a/buildtests/relimp/B/C.py b/buildtests/relimp/B/C.py index f0465c5..c5fece9 100644 --- a/buildtests/relimp/B/C.py +++ b/buildtests/relimp/B/C.py @@ -1,6 +1,7 @@ name = 'relimp.B.C' from . import D # Imports relimp.B.D +from .D import X # Imports relimp.B.D.X from .. import E # Imports relimp.E from ..F import G # Imports relimp.F.G from ..F import H # Imports relimp.F.H diff --git a/buildtests/relimp/B/D.py b/buildtests/relimp/B/D.py index ca741e4..d302f0d 100644 --- a/buildtests/relimp/B/D.py +++ b/buildtests/relimp/B/D.py @@ -1 +1,4 @@ name = 'relimp.B.D' + +class X: + name = 'relimp.B.D.X' diff --git a/buildtests/relimp/relimp/relimp2.py b/buildtests/relimp/relimp/relimp2.py index d852533..fedc784 100644 --- a/buildtests/relimp/relimp/relimp2.py +++ b/buildtests/relimp/relimp/relimp2.py @@ -12,6 +12,11 @@ assert relimp.name == 'relimp.relimp' import relimp assert relimp.name == 'relimp' -from .relimp import relimp2 -assert relimp2.name == 'relimp.relimp2' +import relimp.relimp2 +assert relimp.relimp2.name == 'relimp.relimp2' + +# While this seams to work when running Python, it is wrong: +# .relimp should be a sibling of this package +#from .relimp import relimp2 +#assert relimp2.name == 'relimp.relimp2' diff --git a/buildtests/relimp/relimp/relimp3.py b/buildtests/relimp/relimp/relimp3.py new file mode 100644 index 0000000..2d0d494 --- /dev/null +++ b/buildtests/relimp/relimp/relimp3.py @@ -0,0 +1 @@ +name = 'relimp.relimp.relimp3'