Changeset 391 for python/trunk/Demo/scripts/script.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Demo/scripts/script.py (modified) (3 diffs)

python/trunk/Demo/scripts/script.py

@@ -1 +1 @@
 #! /usr/bin/env python
+
 # script.py -- Make typescript of terminal session.
 # Usage:
@@ -7 +8 @@
 
 
-import os, time, sys
+import os, time, sys, getopt
 import pty
 
 def read(fd):
     data = os.read(fd, 1024)
-    file.write(data)
+    script.write(data)
     return data
 
@@ -20 +21 @@
 if os.environ.has_key('SHELL'):
     shell = os.environ['SHELL']
-if '-a' in sys.argv:
-    mode = 'a'
-if '-p' in sys.argv:
-    shell = 'python'
 
-file = open(filename, mode)
+try:
+    opts, args = getopt.getopt(sys.argv[1:], 'ap')
+except getopt.error, msg:
+    print '%s: %s' % (sys.argv[0], msg)
+    sys.exit(2)
+
+for o, a in opts:
+    if o == '-a':
+        mode = 'a'
+    elif o == '-p':
+        shell = 'python'
+
+script = open(filename, mode)
 
 sys.stdout.write('Script started, file is %s\n' % filename)
-file.write('Script started on %s\n' % time.ctime(time.time()))
+script.write('Script started on %s\n' % time.ctime(time.time()))
 pty.spawn(shell, read)
-file.write('Script done on %s\n' % time.ctime(time.time()))
+script.write('Script done on %s\n' % time.ctime(time.time()))
 sys.stdout.write('Script done, file is %s\n' % filename)