Python 3 preparation: make relative imports explicit.

jsm28 · jsm28 · commit c6b50f0829f0 · 2018-07-24T22:22:08.000Z
Tool-generated patch.
diff --git a/frontends/ZRoundup/__init__.py b/frontends/ZRoundup/__init__.py
@@ -35,7 +35,7 @@
             raise ValueError("Can't determine where ZRoundup is installed")
 
 # product initialisation
-from ZRoundup import ZRoundup, manage_addZRoundupForm, manage_addZRoundup
+from .ZRoundup import ZRoundup, manage_addZRoundupForm, manage_addZRoundup
 def initialize(context):
     context.registerClass(
         ZRoundup,
diff --git a/roundup/backends/indexer_common.py b/roundup/backends/indexer_common.py
@@ -112,25 +112,25 @@ def get_indexer(config, db):
     if not indexer_name:
         # Try everything
         try:
-            from indexer_xapian import Indexer
+            from .indexer_xapian import Indexer
             return Indexer(db)
         except ImportError:
             pass
 
         try:
-            from indexer_whoosh import Indexer
+            from .indexer_whoosh import Indexer
             return Indexer(db)
         except ImportError:
             pass
 
         indexer_name = "native" # fallback to native full text search
 
     if indexer_name == "xapian":
-        from indexer_xapian import Indexer
+        from .indexer_xapian import Indexer
         return Indexer(db)
 
     if indexer_name == "whoosh":
-        from indexer_whoosh import Indexer
+        from .indexer_whoosh import Indexer
         return Indexer(db)
 
     if indexer_name == "native":
diff --git a/roundup/cgi/PageTemplates/Expressions.py b/roundup/cgi/PageTemplates/Expressions.py
@@ -23,15 +23,15 @@
 """
 
 import re, sys
-from TALES import Engine, CompilerError, _valid_name, NAME_RE, \
+from .TALES import Engine, CompilerError, _valid_name, NAME_RE, \
      Undefined, Default, _parse_expr
 
 
 _engine = None
 def getEngine():
     global _engine
     if _engine is None:
-        from PathIterator import Iterator
+        from .PathIterator import Iterator
         _engine = Engine(Iterator)
         installHandlers(_engine)
     return _engine
@@ -46,7 +46,7 @@ def installHandlers(engine):
     reg('not', NotExpr)
     reg('defer', DeferExpr)
 
-from PythonExpr import getSecurityManager, PythonExpr
+from .PythonExpr import getSecurityManager, PythonExpr
 guarded_getattr = getattr
 try:
     from zExceptions import Unauthorized
diff --git a/roundup/cgi/PageTemplates/PageTemplate.py b/roundup/cgi/PageTemplates/PageTemplate.py
@@ -27,7 +27,7 @@
 from roundup.cgi.TAL.TALGenerator import TALGenerator
 # Do not use cStringIO here!  It's not unicode aware. :(
 from roundup.cgi.TAL.TALInterpreter import TALInterpreter, FasterStringIO
-from Expressions import getEngine
+from .Expressions import getEngine
 
 
 class PageTemplate:
diff --git a/roundup/cgi/PageTemplates/PathIterator.py b/roundup/cgi/PageTemplates/PathIterator.py
@@ -17,8 +17,8 @@
 subpaths of elements.
 """
 
-import TALES
-from Expressions import restrictedTraverse, Undefs, getSecurityManager
+from . import TALES
+from .Expressions import restrictedTraverse, Undefs, getSecurityManager
 
 class Iterator(TALES.Iterator):
     def __bobo_traverse__(self, REQUEST, name):
diff --git a/roundup/cgi/PageTemplates/PythonExpr.py b/roundup/cgi/PageTemplates/PythonExpr.py
@@ -17,7 +17,7 @@
 """Generic Python Expression Handler
 """
 
-from TALES import CompilerError
+from .TALES import CompilerError
 from sys import exc_info
 
 class getSecurityManager:
diff --git a/roundup/cgi/PageTemplates/TALES.py b/roundup/cgi/PageTemplates/TALES.py
@@ -23,8 +23,8 @@
 import re, sys
 from roundup.cgi import ZTUtils
 from weakref import ref
-from MultiMapping import MultiMapping
-from GlobalTranslationService import getGlobalTranslationService
+from .MultiMapping import MultiMapping
+from .GlobalTranslationService import getGlobalTranslationService
 
 ustr = str
 
diff --git a/roundup/cgi/TAL/DummyEngine.py b/roundup/cgi/TAL/DummyEngine.py
@@ -21,7 +21,7 @@
 import re
 import sys
 
-from TALDefs import NAME_RE, TALESError, ErrorInfo
+from .TALDefs import NAME_RE, TALESError, ErrorInfo
 #from ITALES import ITALESCompiler, ITALESEngine
 #from DocumentTemplate.DT_Util import ustr
 ustr = str
diff --git a/roundup/cgi/TAL/HTMLParser.py b/roundup/cgi/TAL/HTMLParser.py
@@ -8,7 +8,7 @@
 # and CDATA (character data -- only end tags are special).
 
 
-import markupbase
+from . import markupbase
 import re
 
 # Regular expressions used for parsing
diff --git a/roundup/cgi/TAL/HTMLTALParser.py b/roundup/cgi/TAL/HTMLTALParser.py
@@ -17,9 +17,9 @@
 
 import sys
 
-from TALGenerator import TALGenerator
-from HTMLParser import HTMLParser, HTMLParseError
-from TALDefs import \
+from .TALGenerator import TALGenerator
+from .HTMLParser import HTMLParser, HTMLParseError
+from .TALDefs import \
      ZOPE_METAL_NS, ZOPE_TAL_NS, ZOPE_I18N_NS, METALError, TALError, I18NError
 
 BOOLEAN_HTML_ATTRS = [
diff --git a/roundup/cgi/TAL/TALGenerator.py b/roundup/cgi/TAL/TALGenerator.py
@@ -18,12 +18,12 @@
 import re
 import cgi
 
-import TALDefs
+from . import TALDefs
 
-from TALDefs import NAME_RE, TAL_VERSION
-from TALDefs import I18NError, METALError, TALError
-from TALDefs import parseSubstitution
-from TranslationContext import TranslationContext, DEFAULT_DOMAIN
+from .TALDefs import NAME_RE, TAL_VERSION
+from .TALDefs import I18NError, METALError, TALError
+from .TALDefs import parseSubstitution
+from .TranslationContext import TranslationContext, DEFAULT_DOMAIN
 
 I18N_REPLACE = 1
 I18N_CONTENT = 2
@@ -40,7 +40,7 @@ class TALGenerator:
 
     def __init__(self, expressionCompiler=None, xml=1, source_file=None):
         if not expressionCompiler:
-            from DummyEngine import DummyEngine
+            from .DummyEngine import DummyEngine
             expressionCompiler = DummyEngine()
         self.expressionCompiler = expressionCompiler
         self.CompilerError = expressionCompiler.getCompilerError()
diff --git a/roundup/cgi/TAL/TALInterpreter.py b/roundup/cgi/TAL/TALInterpreter.py
@@ -27,10 +27,10 @@
 #from DocumentTemplate.DT_Util import ustr
 ustr = str
 
-from TALDefs import TAL_VERSION, TALError, METALError, attrEscape
-from TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
-from TALGenerator import TALGenerator
-from TranslationContext import TranslationContext
+from .TALDefs import TAL_VERSION, TALError, METALError, attrEscape
+from .TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
+from .TALGenerator import TALGenerator
+from .TranslationContext import TranslationContext
 
 BOOLEAN_HTML_ATTRS = [
     # List of Boolean attributes in HTML that should be rendered in
@@ -579,15 +579,15 @@ def do_insertStructure_tal(self, (expr, repldict, block)):
     bytecode_handlers["insertStructure"] = do_insertStructure
 
     def insertHTMLStructure(self, text, repldict):
-        from HTMLTALParser import HTMLTALParser
+        from .HTMLTALParser import HTMLTALParser
         gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
         p = HTMLTALParser(gen) # Raises an exception if text is invalid
         p.parseString(text)
         program, macros = p.getCode()
         self.interpret(program)
 
     def insertXMLStructure(self, text, repldict):
-        from TALParser import TALParser
+        from .TALParser import TALParser
         gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
         p = TALParser(gen)
         gen.enable(0)
diff --git a/roundup/cgi/TAL/TALParser.py b/roundup/cgi/TAL/TALParser.py
@@ -15,9 +15,9 @@
 Parse XML and compile to TALInterpreter intermediate code.
 """
 
-from XMLParser import XMLParser
-from TALDefs import XML_NS, ZOPE_I18N_NS, ZOPE_METAL_NS, ZOPE_TAL_NS
-from TALGenerator import TALGenerator
+from .XMLParser import XMLParser
+from .TALDefs import XML_NS, ZOPE_I18N_NS, ZOPE_METAL_NS, ZOPE_TAL_NS
+from .TALGenerator import TALGenerator
 
 class TALParser(XMLParser):
 
@@ -135,8 +135,8 @@ def test():
         file = sys.argv[1]
     p.parseFile(file)
     program, macros = p.getCode()
-    from TALInterpreter import TALInterpreter
-    from DummyEngine import DummyEngine
+    from .TALInterpreter import TALInterpreter
+    from .DummyEngine import DummyEngine
     engine = DummyEngine(macros)
     TALInterpreter(program, macros, engine, sys.stdout, wrap=0)()
 
diff --git a/roundup/cgi/ZTUtils/__init__.py b/roundup/cgi/ZTUtils/__init__.py
@@ -18,6 +18,6 @@
 '''
 __docformat__ = 'restructuredtext'
 
-from Batch import Batch
-from Iterator import Iterator
+from .Batch import Batch
+from .Iterator import Iterator
 
diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
@@ -29,7 +29,7 @@
 from roundup import i18n
 from roundup.i18n import _
 
-from KeywordsExpr import render_keywords_expression_editor
+from .KeywordsExpr import render_keywords_expression_editor
 
 try: 
     # Use the cryptographic source of randomness if available
@@ -244,11 +244,11 @@ def get_loader(dir, template_engine):
 
     for engine_name in engines:
         if engine_name == 'chameleon':
-            from engine_chameleon import Loader
+            from .engine_chameleon import Loader
         elif engine_name == 'jinja2':
-            from engine_jinja2 import Jinja2Loader as Loader
+            from .engine_jinja2 import Jinja2Loader as Loader
         elif engine_name == 'zopetal':
-            from engine_zopetal import Loader
+            from .engine_zopetal import Loader
         else:
             raise Exception('Unknown template engine "%s"' % engine_name)
         ml.add_loader(Loader(dir))
diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
@@ -26,8 +26,8 @@
 import logging
 
 # roundup modules
-import date, password
-from support import ensureParentsExist, PrioList
+from . import date, password
+from .support import ensureParentsExist, PrioList
 from roundup.i18n import _
 from roundup.cgi.exceptions import DetectorError
 
diff --git a/roundup/mailgw.py b/roundup/mailgw.py
@@ -100,7 +100,7 @@ class node. Any parts of other types are each stored in separate files
 import traceback
 import email.utils
 
-from anypy.email_ import decode_header
+from .anypy.email_ import decode_header
 
 from roundup import configuration, hyperdb, date, password, exceptions
 from roundup.mailer import Mailer, MessageSendError
diff --git a/test/benchmark.py b/test/benchmark.py
@@ -5,7 +5,7 @@
     Interval, DatabaseError, Boolean, Number
 from roundup import date, password
 
-from db_test_base import config
+from .db_test_base import config
 
 def setupSchema(db, module):
     status = module.Class(db, "status", name=String())
diff --git a/test/db_test_base.py b/test/db_test_base.py
@@ -18,7 +18,7 @@
 from __future__ import print_function
 import unittest, os, shutil, errno, imp, sys, time, pprint, base64, os.path
 import logging, cgi
-import gpgmelib
+from . import gpgmelib
 from email.parser import FeedParser
 
 import pytest
@@ -34,7 +34,7 @@
 from roundup.cgi.templating import HTMLItem
 from roundup.exceptions import UsageError, Reject
 
-from mocknull import MockNull
+from .mocknull import MockNull
 
 config = configuration.CoreConfig()
 config.DATABASE = "db"
diff --git a/test/session_common.py b/test/session_common.py
@@ -1,6 +1,6 @@
 import os, shutil, unittest
 
-from db_test_base import config
+from .db_test_base import config
 
 
 class SessionTest(object):
diff --git a/test/test_actions.py b/test/test_actions.py
@@ -8,7 +8,7 @@
 from roundup.cgi.client import add_message
 from roundup.cgi.exceptions import Redirect, Unauthorised, SeriousError, FormError
 
-from mocknull import MockNull
+from .mocknull import MockNull
 
 def true(*args, **kwargs):
     return 1
diff --git a/test/test_anydbm.py b/test/test_anydbm.py
@@ -18,8 +18,8 @@
 import unittest, os, shutil, time
 from roundup.backends import get_backend
 
-from db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
-from db_test_base import HTMLItemTest, SpecialActionTest
+from .db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
+from .db_test_base import HTMLItemTest, SpecialActionTest
 
 class anydbmOpener:
     module = get_backend('anydbm')
@@ -48,7 +48,7 @@ class anydbmHTMLItemTest(HTMLItemTest, unittest.TestCase):
     backend = 'anydbm'
 
 
-from session_common import SessionTest
+from .session_common import SessionTest
 class anydbmSessionTest(anydbmOpener, SessionTest, unittest.TestCase):
     pass
 
diff --git a/test/test_cgi.py b/test/test_cgi.py
@@ -22,10 +22,10 @@
 # For testing very simple rendering
 from roundup.cgi.engine_zopetal import RoundupPageTemplate
 
-from mocknull import MockNull
+from .mocknull import MockNull
 
-import db_test_base
-from db_test_base import FormTestParent, setupTracker, FileUpload
+from . import db_test_base
+from .db_test_base import FormTestParent, setupTracker, FileUpload
 
 class FileList:
     def __init__(self, name, *files):
diff --git a/test/test_indexer.py b/test/test_indexer.py
@@ -25,10 +25,10 @@
 from roundup.backends.indexer_rdbms import Indexer
 
 # borrow from other tests
-from db_test_base import setupSchema, config
+from .db_test_base import setupSchema, config
 from .test_postgresql import postgresqlOpener, skip_postgresql
 from .test_mysql import mysqlOpener, skip_mysql
-from test_sqlite import sqliteOpener
+from .test_sqlite import sqliteOpener
 
 try:
     import xapian
diff --git a/test/test_jinja2.py b/test/test_jinja2.py
@@ -12,7 +12,7 @@
 import shutil # only, needed for tearDown. TODO: Remove when refactored.
 import unittest
 
-import db_test_base
+from . import db_test_base
 
 TESTSUITE_IDENTIFIER='jinja2'
 
diff --git a/test/test_mailgw.py b/test/test_mailgw.py
@@ -12,7 +12,7 @@
 # TODO: test bcc
 
 import email
-import gpgmelib
+from . import gpgmelib
 import unittest, tempfile, os, shutil, errno, imp, sys, difflib, time
 
 import pytest
@@ -40,7 +40,7 @@
 from roundup import init, instance, password, __version__
 
 #import db_test_base
-import memorydb
+from . import memorydb
 
 def expectedFailure(method):
     """ For marking a failing test.
diff --git a/test/test_memorydb.py b/test/test_memorydb.py
diff --git a/test/test_mysql.py b/test/test_mysql.py
diff --git a/test/test_postgresql.py b/test/test_postgresql.py
diff --git a/test/test_security.py b/test/test_security.py
diff --git a/test/test_sqlite.py b/test/test_sqlite.py
diff --git a/test/test_templating.py b/test/test_templating.py
diff --git a/test/test_userauditor.py b/test/test_userauditor.py
diff --git a/test/test_xmlrpc.py b/test/test_xmlrpc.py
