[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: explicit relative imports

[Marius Gedminas]

Log message for revision 129178:
  Towards Py3K: explicit relative imports

Changed:
  U   zope.tal/trunk/src/zope/tal/driver.py
  U   zope.tal/trunk/src/zope/tal/dummyengine.py
  U   zope.tal/trunk/src/zope/tal/runtest.py
  U   zope.tal/trunk/src/zope/tal/tests/run.py

-=-
Modified: zope.tal/trunk/src/zope/tal/driver.py
===================================================================
--- zope.tal/trunk/src/zope/tal/driver.py	2013-02-07 20:35:41 UTC (rev 129177)
+++ zope.tal/trunk/src/zope/tal/driver.py	2013-02-07 20:35:45 UTC (rev 129178)
@@ -45,7 +45,7 @@
 import getopt
 
 if __name__ == "__main__":
-    import setpath                      # Local hack to tweak sys.path etc.
+    from . import setpath               # Local hack to tweak sys.path etc.
 
 # Import local classes
 import zope.tal.taldefs

Modified: zope.tal/trunk/src/zope/tal/dummyengine.py
===================================================================
--- zope.tal/trunk/src/zope/tal/dummyengine.py	2013-02-07 20:35:41 UTC (rev 129177)
+++ zope.tal/trunk/src/zope/tal/dummyengine.py	2013-02-07 20:35:45 UTC (rev 129178)
@@ -160,7 +160,7 @@
             macro = self.macros[localName]
         else:
             # External macro
-            import driver
+            from . import driver
             program, macros = driver.compilefile(file)
             macro = macros.get(localName)
             if not macro:

Modified: zope.tal/trunk/src/zope/tal/runtest.py
===================================================================
--- zope.tal/trunk/src/zope/tal/runtest.py	2013-02-07 20:35:41 UTC (rev 129177)
+++ zope.tal/trunk/src/zope/tal/runtest.py	2013-02-07 20:35:45 UTC (rev 129178)
@@ -25,13 +25,13 @@
 from cStringIO import StringIO
 
 if __name__ == "__main__":
-    import setpath                      # Local hack to tweak sys.path etc.
+    from . import setpath               # Local hack to tweak sys.path etc.
 
 import zope.tal.driver
 import zope.tal.tests.utils
 
 def showdiff(a, b):
-    import ndiff
+    from . import ndiff # XXX consider using difflib
     cruncher = ndiff.SequenceMatcher(ndiff.IS_LINE_JUNK, a, b)
     for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
         if tag == "equal":

Modified: zope.tal/trunk/src/zope/tal/tests/run.py
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/run.py	2013-02-07 20:35:41 UTC (rev 129177)
+++ zope.tal/trunk/src/zope/tal/tests/run.py	2013-02-07 20:35:45 UTC (rev 129178)
@@ -28,7 +28,7 @@
     suite = unittest.TestSuite()
     suite.addTest(test_htmltalparser.test_suite())
     if not utils.skipxml:
-        import test_xmlparser
+        from . import test_xmlparser
         suite.addTest(test_xmlparser.test_suite())
     suite.addTest(test_talinterpreter.test_suite())
     suite.addTest(test_files.test_suite())