# HG changeset patch # User Paul Boddie # Date 1102985467 -3600 # Node ID 0e8017ad00536277c3f60dfa9bc9822e611fb537 # Parent e4f7daee37f23d2c632032b70f75f67ab52f524c Fixed imports from __this__ within the multi-root import mechanism. This avoids multiple imports from the current directory. diff -r e4f7daee37f2 -r 0e8017ad0053 classhook.py --- a/classhook.py Tue Dec 14 01:35:34 2004 +0100 +++ b/classhook.py Tue Dec 14 01:51:07 2004 +0100 @@ -150,7 +150,10 @@ # Provide a special name for the current directory. if name == "__this__": - path = "." + if dir == None: + return (None, ".", ("", "", JAVA_PACKAGE)) + else: + return None # Where no directory is given, return failure immediately.