diff --git a/Examples/python/import_packages/namespace_pkg/runme.py b/Examples/python/import_packages/namespace_pkg/runme.py index 89958db42..94ba6ac1e 100644 --- a/Examples/python/import_packages/namespace_pkg/runme.py +++ b/Examples/python/import_packages/namespace_pkg/runme.py @@ -1,14 +1,51 @@ -import os, sys, setupPkg - # These examples rely on namespace packages. Don't # run them for old python interpreters. +import sys if sys.version_info < (3, 3, 0): sys.exit(0) -setupPkg.copyMods() -# Run each test with a seperate 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") +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 seperate 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/setupPkg.py b/Examples/python/import_packages/namespace_pkg/setupPkg.py deleted file mode 100644 index 3df237a51..000000000 --- a/Examples/python/import_packages/namespace_pkg/setupPkg.py +++ /dev/null @@ -1,34 +0,0 @@ -#--------------------------------- -# setup the namespace package dirs -#--------------------------------- -import os, shutil, 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() - -if __name__ == "__main__": - copyMods()