[pypy-svn] r78716 - pypy/trunk/pypy/tool
fijal at codespeak.net
fijal at codespeak.net
Fri Nov 5 09:50:04 CET 2010
Author: fijal
Date: Fri Nov 5 09:50:01 2010
New Revision: 78716
Modified:
pypy/trunk/pypy/tool/alarm.py
pypy/trunk/pypy/tool/readdictinfo.py
pypy/trunk/pypy/tool/rundictbenchmarks.py
pypy/trunk/pypy/tool/statistic_irc_log.py
pypy/trunk/pypy/tool/watchdog.py
pypy/trunk/pypy/tool/watchdog_nt.py
Log:
A bit pointless approach to clean up here. Put if __name__ == '__main__' a
bit, most of it should be deleted IMO
Modified: pypy/trunk/pypy/tool/alarm.py
==============================================================================
--- pypy/trunk/pypy/tool/alarm.py (original)
+++ pypy/trunk/pypy/tool/alarm.py Fri Nov 5 09:50:01 2010
@@ -38,8 +38,9 @@
sys.path.insert(0, os.path.dirname(sys.argv[0]))
return sys.argv[0]
-finished = []
-try:
- execfile(_main_with_alarm(finished))
-finally:
- finished.append(True)
+if __name__ == '__main__':
+ finished = []
+ try:
+ execfile(_main_with_alarm(finished))
+ finally:
+ finished.append(True)
Modified: pypy/trunk/pypy/tool/readdictinfo.py
==============================================================================
--- pypy/trunk/pypy/tool/readdictinfo.py (original)
+++ pypy/trunk/pypy/tool/readdictinfo.py Fri Nov 5 09:50:01 2010
@@ -7,37 +7,38 @@
import sys
-infile = open(sys.argv[1])
+if __name__ == '__main__':
+ infile = open(sys.argv[1])
-curr = None
-slots = []
-for line in infile:
- if line == '------------------\n':
- if curr:
- break
- curr = 1
- else:
- attr, val = [s.strip() for s in line.split(':')]
- slots.append(attr)
+ curr = None
+ slots = []
+ for line in infile:
+ if line == '------------------\n':
+ if curr:
+ break
+ curr = 1
+ else:
+ attr, val = [s.strip() for s in line.split(':')]
+ slots.append(attr)
-class DictInfo(object):
- __slots__ = slots
+ class DictInfo(object):
+ __slots__ = slots
-infile = open(sys.argv[1])
+ infile = open(sys.argv[1])
-infos = []
+ infos = []
-for line in infile:
- if line == '------------------\n':
- curr = object.__new__(DictInfo)
- infos.append(curr)
- else:
- attr, val = [s.strip() for s in line.split(':')]
- if '.' in val:
- val = float(val)
+ for line in infile:
+ if line == '------------------\n':
+ curr = object.__new__(DictInfo)
+ infos.append(curr)
else:
- val = int(val)
- setattr(curr, attr, val)
+ attr, val = [s.strip() for s in line.split(':')]
+ if '.' in val:
+ val = float(val)
+ else:
+ val = int(val)
+ setattr(curr, attr, val)
def histogram(infos, keyattr, *attrs):
r = {}
Modified: pypy/trunk/pypy/tool/rundictbenchmarks.py
==============================================================================
--- pypy/trunk/pypy/tool/rundictbenchmarks.py (original)
+++ pypy/trunk/pypy/tool/rundictbenchmarks.py Fri Nov 5 09:50:01 2010
@@ -7,20 +7,21 @@
# need to hack a copy of rst2html for yourself (svn docutils
# required).
-try:
- os.unlink("dictinfo.txt")
-except os.error:
- pass
+if __name__ == '__main__':
+ try:
+ os.unlink("dictinfo.txt")
+ except os.error:
+ pass
-progs = [('pystone', ['-c', 'from test import pystone; pystone.main()']),
- ('richards', ['richards.py']),
- ('docutils', ['rst2html.py', '../../doc/coding-guide.txt', 'foo.html']),
- ('translate', ['translate.py', '--backendopt', '--no-compile', '--batch',
- 'targetrpystonedalone.py'])
- ]
+ progs = [('pystone', ['-c', 'from test import pystone; pystone.main()']),
+ ('richards', ['richards.py']),
+ ('docutils', ['rst2html.py', '../../doc/coding-guide.txt', 'foo.html']),
+ ('translate', ['translate.py', '--backendopt', '--no-compile', '--batch',
+ 'targetrpystonedalone.py'])
+ ]
-EXE = sys.argv[1]
+ EXE = sys.argv[1]
-for suffix, args in progs:
- os.spawnv(os.P_WAIT, EXE, [EXE] + args)
- os.rename('dictinfo.txt', 'dictinfo-%s.txt'%suffix)
+ for suffix, args in progs:
+ os.spawnv(os.P_WAIT, EXE, [EXE] + args)
+ os.rename('dictinfo.txt', 'dictinfo-%s.txt'%suffix)
Modified: pypy/trunk/pypy/tool/statistic_irc_log.py
==============================================================================
--- pypy/trunk/pypy/tool/statistic_irc_log.py (original)
+++ pypy/trunk/pypy/tool/statistic_irc_log.py Fri Nov 5 09:50:01 2010
@@ -2,53 +2,54 @@
from os import system, chdir
from urllib import urlopen
-log_URL = 'http://tismerysoft.de/pypy/irc-logs/'
-archive_FILENAME = 'pypy.tar.gz'
-
-tempdir = py.test.ensuretemp("irc-log")
-
-# get compressed archive
-chdir( str(tempdir))
-system('wget -q %s%s' % (log_URL, archive_FILENAME))
-system('tar xzf %s' % archive_FILENAME)
-chdir('pypy')
-
-# get more recent daily logs
-pypydir = tempdir.join('pypy')
-for line in urlopen(log_URL + 'pypy/').readlines():
- i = line.find('%23pypy.log.')
- if i == -1:
- continue
- filename = line[i:].split('"')[0]
- system('wget -q %spypy/%s' % (log_URL, filename))
-
-# rename to YYYYMMDD
-for log_filename in pypydir.listdir('#pypy.log.*'):
- rename_to = None
- b = log_filename.basename
- if '-' in b:
- rename_to = log_filename.basename.replace('-', '')
- elif len(b) == 19:
- months= 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split()
- day = b[10:12]
- month = months.index(b[12:15]) + 1
- year = b[15:20]
- rename_to = '#pypy.log.%04s%02d%02s' % (year, month, day)
-
- if rename_to:
- log_filename.rename(rename_to)
- #print 'RENAMED', log_filename, 'TO', rename_to
-
-# print sorted list of filenames of daily logs
-print 'irc://irc.freenode.org/pypy'
-print 'date, messages, visitors'
-for log_filename in pypydir.listdir('#pypy.log.*'):
- n_messages, visitors = 0, {}
- f = str(log_filename)
- for s in file(f):
- if '<' in s and '>' in s:
- n_messages += 1
- elif ' joined #pypy' in s:
- v = s.split()[1]
- visitors[v] = True
- print '%04s-%02s-%02s, %d, %d' % (f[-8:-4], f[-4:-2], f[-2:], n_messages, len(visitors.keys()))
+if __name__ == '__main__':
+ log_URL = 'http://tismerysoft.de/pypy/irc-logs/'
+ archive_FILENAME = 'pypy.tar.gz'
+
+ tempdir = py.test.ensuretemp("irc-log")
+
+ # get compressed archive
+ chdir( str(tempdir))
+ system('wget -q %s%s' % (log_URL, archive_FILENAME))
+ system('tar xzf %s' % archive_FILENAME)
+ chdir('pypy')
+
+ # get more recent daily logs
+ pypydir = tempdir.join('pypy')
+ for line in urlopen(log_URL + 'pypy/').readlines():
+ i = line.find('%23pypy.log.')
+ if i == -1:
+ continue
+ filename = line[i:].split('"')[0]
+ system('wget -q %spypy/%s' % (log_URL, filename))
+
+ # rename to YYYYMMDD
+ for log_filename in pypydir.listdir('#pypy.log.*'):
+ rename_to = None
+ b = log_filename.basename
+ if '-' in b:
+ rename_to = log_filename.basename.replace('-', '')
+ elif len(b) == 19:
+ months= 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split()
+ day = b[10:12]
+ month = months.index(b[12:15]) + 1
+ year = b[15:20]
+ rename_to = '#pypy.log.%04s%02d%02s' % (year, month, day)
+
+ if rename_to:
+ log_filename.rename(rename_to)
+ #print 'RENAMED', log_filename, 'TO', rename_to
+
+ # print sorted list of filenames of daily logs
+ print 'irc://irc.freenode.org/pypy'
+ print 'date, messages, visitors'
+ for log_filename in pypydir.listdir('#pypy.log.*'):
+ n_messages, visitors = 0, {}
+ f = str(log_filename)
+ for s in file(f):
+ if '<' in s and '>' in s:
+ n_messages += 1
+ elif ' joined #pypy' in s:
+ v = s.split()[1]
+ visitors[v] = True
+ print '%04s-%02s-%02s, %d, %d' % (f[-8:-4], f[-4:-2], f[-2:], n_messages, len(visitors.keys()))
Modified: pypy/trunk/pypy/tool/watchdog.py
==============================================================================
--- pypy/trunk/pypy/tool/watchdog.py (original)
+++ pypy/trunk/pypy/tool/watchdog.py Fri Nov 5 09:50:01 2010
@@ -7,9 +7,6 @@
return name
return 'signal %d' % (n,)
-timeout = float(sys.argv[1])
-timedout = False
-
def childkill():
global timedout
timedout = True
@@ -20,31 +17,35 @@
except OSError:
pass
-pid = os.fork()
-if pid == 0:
- os.execvp(sys.argv[2], sys.argv[2:])
-else: # parent
- t = threading.Timer(timeout, childkill)
- t.start()
- while True:
- try:
- pid, status = os.waitpid(pid, 0)
- except KeyboardInterrupt:
- continue
+if __name__ == '__main__':
+ timeout = float(sys.argv[1])
+ timedout = False
+
+ pid = os.fork()
+ if pid == 0:
+ os.execvp(sys.argv[2], sys.argv[2:])
+ else: # parent
+ t = threading.Timer(timeout, childkill)
+ t.start()
+ while True:
+ try:
+ pid, status = os.waitpid(pid, 0)
+ except KeyboardInterrupt:
+ continue
+ else:
+ t.cancel()
+ break
+ if os.WIFEXITED(status):
+ sys.exit(os.WEXITSTATUS(status))
else:
- t.cancel()
- break
- if os.WIFEXITED(status):
- sys.exit(os.WEXITSTATUS(status))
- else:
- assert os.WIFSIGNALED(status)
- sign = os.WTERMSIG(status)
- if timedout and sign == signal.SIGTERM:
+ assert os.WIFSIGNALED(status)
+ sign = os.WTERMSIG(status)
+ if timedout and sign == signal.SIGTERM:
+ sys.exit(1)
+ signame = getsignalname(sign)
+ sys.stderr.write("="*26 + "timedout" + "="*26 + "\n")
+ sys.stderr.write("="*25 + " %-08s " % signame + "="*25 + "\n")
sys.exit(1)
- signame = getsignalname(sign)
- sys.stderr.write("="*26 + "timedout" + "="*26 + "\n")
- sys.stderr.write("="*25 + " %-08s " % signame + "="*25 + "\n")
- sys.exit(1)
-
-
+
+
Modified: pypy/trunk/pypy/tool/watchdog_nt.py
==============================================================================
--- pypy/trunk/pypy/tool/watchdog_nt.py (original)
+++ pypy/trunk/pypy/tool/watchdog_nt.py Fri Nov 5 09:50:01 2010
@@ -2,11 +2,6 @@
import threading
import ctypes
-PROCESS_TERMINATE = 0x1
-
-timeout = float(sys.argv[1])
-timedout = False
-
def childkill(pid):
global timedout
timedout = True
@@ -14,19 +9,25 @@
sys.stderr.write("="*26 + "timedout" + "="*26 + "\n")
ctypes.windll.kernel32.TerminateProcess(pid, 1)
-pid = os.spawnv(os.P_NOWAIT, sys.argv[2], sys.argv[2:])
+if __name__ == '__main__':
+ PROCESS_TERMINATE = 0x1
+
+ timeout = float(sys.argv[1])
+ timedout = False
+
+ pid = os.spawnv(os.P_NOWAIT, sys.argv[2], sys.argv[2:])
+
+ t = threading.Timer(timeout, childkill, (pid,))
+ t.start()
+ while True:
+ try:
+ pid, status = os.waitpid(pid, 0)
+ except KeyboardInterrupt:
+ continue
+ else:
+ t.cancel()
+ break
+
+ #print 'status ', status >> 8
+ sys.exit(status >> 8)
-t = threading.Timer(timeout, childkill, (pid,))
-t.start()
-while True:
- try:
- pid, status = os.waitpid(pid, 0)
- except KeyboardInterrupt:
- continue
- else:
- t.cancel()
- break
-
-#print 'status ', status >> 8
-sys.exit(status >> 8)
-
More information about the Pypy-commit
mailing list