equal
deleted
inserted
replaced
257 if options.debug: |
257 if options.debug: |
258 if options.timeout != defaults['timeout']: |
258 if options.timeout != defaults['timeout']: |
259 sys.stderr.write( |
259 sys.stderr.write( |
260 'warning: --timeout option ignored with --debug\n') |
260 'warning: --timeout option ignored with --debug\n') |
261 options.timeout = 0 |
261 options.timeout = 0 |
262 if options.timeout and not hasattr(subprocess.Popen, 'terminate'): |
|
263 sys.stderr.write('warning: timeout is not supported on this ' |
|
264 'platform and will be ignored\n') |
|
265 options.timeout = 0 |
|
266 if options.py3k_warnings: |
262 if options.py3k_warnings: |
267 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): |
263 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): |
268 parser.error('--py3k-warnings can only be used on Python 2.6+') |
264 parser.error('--py3k-warnings can only be used on Python 2.6+') |
269 if options.blacklist: |
265 if options.blacklist: |
270 options.blacklist = parselistfiles(options.blacklist, 'blacklist') |
266 options.blacklist = parselistfiles(options.blacklist, 'blacklist') |