[Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.1,1.2 test.py,1.4,1.5

[Jeremy Hylton]

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/tmp/Compiler

Modified Files:
	compile.py test.py 
Log Message:
patches from Mark Hammond

compile.py:
On Windows, use 'nul' instead of '/dev/null'.

test.py:
Use double-quotes for the command-line, as Windows doesnt recognise
singles.



Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** compile.py	2000/03/06 19:13:21	1.1
--- compile.py	2000/05/02 22:29:46	1.2
***************
*** 12,16 ****
              visitor.ASTVisitor.VERBOSE = visitor.ASTVisitor.VERBOSE + 1
          if k == '-q':
!             f = open('/dev/null', 'wb')
              sys.stdout = f
      if not args:
--- 12,19 ----
              visitor.ASTVisitor.VERBOSE = visitor.ASTVisitor.VERBOSE + 1
          if k == '-q':
!             if sys.platform[:3]=="win":
!                 f = open('nul', 'wb') # /dev/null fails on Windows...
!             else:
!                 f = open('/dev/null', 'wb')
              sys.stdout = f
      if not args:

Index: test.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/test.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test.py	2000/02/10 17:34:12	1.4
--- test.py	2000/05/02 22:29:46	1.5
***************
*** 17,21 ****
          output = "experimental/%s.txt" % base
          os.system("python ../compile.py -q %s" % path)
!         os.system("python -c 'import %s' > %s 2>&1" % (base, output))
          os.system("diff -c %s %s" % ("%s/%s.txt" % (outputDir, base),
                                       output))
--- 17,21 ----
          output = "experimental/%s.txt" % base
          os.system("python ../compile.py -q %s" % path)
!         os.system('python -c "import %s" > %s 2>&1' % (base, output))
          os.system("diff -c %s %s" % ("%s/%s.txt" % (outputDir, base),
                                       output))