From: <pj...@us...> - 2009-05-24 03:19:38
|
Revision: 6373 http://jython.svn.sourceforge.net/jython/?rev=6373&view=rev Author: pjenvey Date: 2009-05-24 03:19:33 +0000 (Sun, 24 May 2009) Log Message: ----------- small cleanup Modified Paths: -------------- trunk/jython/Lib/test/test_chdir.py Modified: trunk/jython/Lib/test/test_chdir.py =================================================================== --- trunk/jython/Lib/test/test_chdir.py 2009-05-24 02:53:41 UTC (rev 6372) +++ trunk/jython/Lib/test/test_chdir.py 2009-05-24 03:19:33 UTC (rev 6373) @@ -17,13 +17,8 @@ COMPILED_SUFFIX = [suffix for suffix, mode, type in imp.get_suffixes() if type == imp.PY_COMPILED][0] -EXECUTABLE = sys.executable or \ - (sys.platform.startswith('java') and 'jython' or None) +WINDOWS = (os._name if test_support.is_jython else os.name) == 'nt' -WINDOWS = os.name in ('nt', 'ce') or sys.platform.startswith('java') and \ - os._name in ('nt', 'ce') - - CODE1 = """result = 'result is %r' % (100.0 * (3.0 / 5.0))""" CODE1_RESULT = 'result is %r' % (100.0 * (3.0 / 5.0)) @@ -383,7 +378,7 @@ # Write out the external app's cwd to a file we'll specify in setUp COMMAND = '''\ "%s" -c "import os; fp = open(r'%%s', 'w'); fp.write(os.getcwd())"''' % \ - EXECUTABLE + sys.executable def test_popen(self): os.popen(self._command()).read() @@ -684,13 +679,13 @@ ListdirTestCase, DirsTestCase, FilesTestCase] - if sys.platform.startswith('java'): + if WINDOWS: + tests.append(WindowsChdirTestCase) + if test_support.is_jython: tests.extend((ImportJavaClassTestCase, ImportJarTestCase)) if test_support.is_resource_enabled('subprocess'): tests.append(SubprocessTestCase) - if WINDOWS: - tests.append(WindowsChdirTestCase) test_support.run_unittest(*tests) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |