svn commit: r1742818 - in /subversion/trunk/subversion/tests/cmdline/svntest: __init__.py deeptrees.py mergetrees.py

[st...@apache.org]

Author: stefan2
Date: Sun May  8 13:42:35 2016
New Revision: 1742818

URL: http://svn.apache.org/viewvc?rev=1742818&view=rev
Log:
Relative module / import lookup is more strict in Python 3.  Provide the
relative paths where needed in our build and test scripts.  These continue
to work with Python 2 just fine.

* subversion/tests/cmdline/svntest/__init__.py
* subversion/tests/cmdline/svntest/deeptrees.py
* subversion/tests/cmdline/svntest/mergetrees.py
  (): Make the import path explicit.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/__init__.py
    subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
    subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/__init__.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/__init__.py?rev=1742818&r1=1742817&r2=1742818&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/__init__.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/__init__.py Sun May  8 13:42:35 2016
@@ -53,11 +53,11 @@ class Skip(Exception):
   pass
 
 # import in a specific order: things with the fewest circular imports first.
-import testcase
-import wc
-import verify
-import tree
-import sandbox
-import main
-import actions
-import factory
+from . import testcase
+from . import wc
+from . import verify
+from . import tree
+from . import sandbox
+from . import main
+from . import actions
+from . import factory

Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1742818&r1=1742817&r2=1742818&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Sun May  8 13:42:35 2016
@@ -37,7 +37,7 @@ else:
 import svntest
 from svntest import main, verify, tree, wc, sandbox
 from svntest import Failure
-from actions import *
+from svntest.actions import *
 
 logger = logging.getLogger()
 

Modified: subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py?rev=1742818&r1=1742817&r2=1742818&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py Sun May  8 13:42:35 2016
@@ -29,7 +29,7 @@ import shutil, sys, re, os
 import time
 
 # Our testing module
-import main, wc, verify, actions, testcase
+from svntest import main, wc, verify, actions, testcase
 
 from prop_tests import binary_mime_type_on_text_file_warning