remove -py3 related tests. Move py3 specific code to it's own module

21 files changed, 49 insertions, 226 deletions

diff --git a/Examples/python/import_packages/namespace_pkg/nstest.py b/Examples/python/import_packages/namespace_pkg/nstest.py
new file mode 100644
index 000000000..9b075ad8c
--- /dev/null
+++ b/Examples/python/import_packages/namespace_pkg/nstest.py
@@ -0,0 +1,45 @@
+import sys
+import os
+import shutil
+import zipfile
+
+
+def copyMods():
+    dirs = ['path1', 'path2', 'path3']
+
+    # Clean out any old package paths
+    for d in dirs:
+        if os.path.isdir(d):
+            shutil.rmtree(d)
+
+    for d in dirs:
+        os.mkdir(d)
+        os.mkdir(os.path.join(d, 'brave'))
+
+    shutil.copy('robin.py', os.path.join('path1', 'brave'))
+    os.system('cp _robin.* ' + os.path.join('path1', 'brave'))
+
+    shutil.copy('robin.py', os.path.join('path2', 'brave'))
+    os.system('cp _robin.* ' + os.path.join('path3', 'brave'))
+
+    mkzip()
+
+def mkzip():
+    zf = zipfile.ZipFile("path4.zip", "w")
+    zf.writestr("brave/", b'')
+    zf.write('robin.py', 'brave/robin.py')
+    zf.close()
+
+
+def main():
+    copyMods()
+
+    # Run each test with a separate interpreter
+    os.system(sys.executable + " nonpkg.py")
+    os.system(sys.executable + " normal.py")
+    os.system(sys.executable + " split.py")
+    os.system(sys.executable + " zipsplit.py")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Examples/python/import_packages/namespace_pkg/runme.py b/Examples/python/import_packages/namespace_pkg/runme.py
index 43fc12ab6..4d0aa755c 100644
--- a/Examples/python/import_packages/namespace_pkg/runme.py
+++ b/Examples/python/import_packages/namespace_pkg/runme.py
@@ -4,48 +4,5 @@ import sys
 if sys.version_info < (3, 3, 0):
     sys.exit(0)
 
-
-import os
-import shutil
-import zipfile
-
-
-def copyMods():
-    dirs = ['path1', 'path2', 'path3']
-
-    # Clean out any old package paths
-    for d in dirs:
-        if os.path.isdir(d):
-            shutil.rmtree(d)
-
-    for d in dirs:
-        os.mkdir(d)
-        os.mkdir(os.path.join(d, 'brave'))
-
-    shutil.copy('robin.py', os.path.join('path1', 'brave'))
-    os.system('cp _robin.* ' + os.path.join('path1', 'brave'))
-
-    shutil.copy('robin.py', os.path.join('path2', 'brave'))
-    os.system('cp _robin.* ' + os.path.join('path3', 'brave'))
-
-    mkzip()
-
-def mkzip():
-    zf = zipfile.ZipFile("path4.zip", "w")
-    zf.writestr("brave/", b'')
-    zf.write('robin.py', 'brave/robin.py')
-    zf.close()
-
-
-def main():
-    copyMods()
-
-    # Run each test with a separate interpreter
-    os.system(sys.executable + " nonpkg.py")
-    os.system(sys.executable + " normal.py")
-    os.system(sys.executable + " split.py")
-    os.system(sys.executable + " zipsplit.py")
-
-
-if __name__ == "__main__":
-    main()
+import nstest
+nstest.main()
diff --git a/Examples/python/import_packages/split_modules/Makefile b/Examples/python/import_packages/split_modules/Makefile
index 37674108a..dd1f2152e 100644
--- a/Examples/python/import_packages/split_modules/Makefile
+++ b/Examples/python/import_packages/split_modules/Makefile
@@ -1,8 +1,8 @@
 TOP        = ../../..
 LIBS       =
 
-subdirs = builtin vanilla builtin_split vanilla_split \
-          builtin_nopy3 vanilla_nopy3 builtin_split_nopy3 vanilla_split_nopy3
+subdirs = builtin vanilla builtin_split vanilla_split
+
 
 check: build
 	for s in $(subdirs); do \
diff --git a/Examples/python/import_packages/split_modules/builtin_nopy3/Makefile b/Examples/python/import_packages/split_modules/builtin_nopy3/Makefile
deleted file mode 100644
index b679d60a0..000000000
--- a/Examples/python/import_packages/split_modules/builtin_nopy3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP        = ../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    =
-LIBS       =
-
-check: build
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
-
-build:
-	cd pkg1 && $(MAKE) build
-
-static:
-	cd pkg1 && $(MAKE) static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
-	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile
deleted file mode 100644
index a6672eb4c..000000000
--- a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-TOP        = ../../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    = -builtin
-LIBS       =
-
-build:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-        SWIGPYTHON='$$(SWIG) -python' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
-        INTERFACE='foo.i' python_cpp
-
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
-        INTERFACE='foo.i' python_cpp_static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
-
diff --git a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py
deleted file mode 100644
index 7b1594cc8..000000000
--- a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# killroy was here
diff --git a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i
deleted file mode 100644
index 00df2d009..000000000
--- a/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module(package="pkg1") foo
-%{
-static unsigned count(void)
-    {
-    return 3;
-    }
-%}
-
-unsigned count(void);
-
diff --git a/Examples/python/import_packages/split_modules/builtin_nopy3/runme.py b/Examples/python/import_packages/split_modules/builtin_nopy3/runme.py
deleted file mode 100644
index 8a6055bf1..000000000
--- a/Examples/python/import_packages/split_modules/builtin_nopy3/runme.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import pkg1.foo
-
-assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile b/Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile
deleted file mode 100644
index 9b1334c85..000000000
--- a/Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TOP        = ../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    = -builtin -outdir pkg1
-LIBS       =
-
-check: build
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
-
-build:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-        SWIGPYTHON='$$(SWIG) -python' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
-
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
-	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i b/Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i
deleted file mode 100644
index 00df2d009..000000000
--- a/Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module(package="pkg1") foo
-%{
-static unsigned count(void)
-    {
-    return 3;
-    }
-%}
-
-unsigned count(void);
-
diff --git a/Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py
deleted file mode 100644
index 7b1594cc8..000000000
--- a/Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# killroy was here
diff --git a/Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py b/Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py
deleted file mode 100644
index 8a6055bf1..000000000
--- a/Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import pkg1.foo
-
-assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile b/Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile
deleted file mode 100644
index b679d60a0..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP        = ../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    =
-LIBS       =
-
-check: build
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
-
-build:
-	cd pkg1 && $(MAKE) build
-
-static:
-	cd pkg1 && $(MAKE) static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
-	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile
deleted file mode 100644
index 338a41725..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP        = ../../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    =
-LIBS       =
-
-build:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-        SWIGPYTHON='$$(SWIG) -python' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
-
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py
deleted file mode 100644
index 7b1594cc8..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# killroy was here
diff --git a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i
deleted file mode 100644
index 00df2d009..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module(package="pkg1") foo
-%{
-static unsigned count(void)
-    {
-    return 3;
-    }
-%}
-
-unsigned count(void);
-
diff --git a/Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py b/Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py
deleted file mode 100644
index 8a6055bf1..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import pkg1.foo
-
-assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile
deleted file mode 100644
index f9a0e7808..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TOP        = ../../../..
-SWIGEXE    = $(TOP)/../swig
-SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
-SWIGOPT    = -outdir pkg1
-LIBS       =
-
-check: build
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
-
-build:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-        SWIGPYTHON='$$(SWIG) -python' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
-
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
-
-clean:
-	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
-	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i
deleted file mode 100644
index 00df2d009..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module(package="pkg1") foo
-%{
-static unsigned count(void)
-    {
-    return 3;
-    }
-%}
-
-unsigned count(void);
-
diff --git a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py
deleted file mode 100644
index 7b1594cc8..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# killroy was here
diff --git a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py
deleted file mode 100644
index 8a6055bf1..000000000
--- a/Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import pkg1.foo
-
-assert(pkg1.foo.count() == 3)