Commit 809417ee authored by Stefan Behnel's avatar Stefan Behnel

Python fixes

parent 00a108d2
...@@ -47,7 +47,7 @@ Options: ...@@ -47,7 +47,7 @@ Options:
# transforms for the same phase will be used in the order they are given. # transforms for the same phase will be used in the order they are given.
def bad_usage(): def bad_usage():
print >>sys.stderr, usage sys.stderr.write(usage)
sys.exit(1) sys.exit(1)
def parse_command_line(args): def parse_command_line(args):
...@@ -135,14 +135,14 @@ def parse_command_line(args): ...@@ -135,14 +135,14 @@ def parse_command_line(args):
elif arg.endswith(".o"): elif arg.endswith(".o"):
options.objects.append(arg) options.objects.append(arg)
else: else:
print >>sys.stderr, \ sys.stderr.write(
"cython: %s: Unknown filename suffix" % arg "cython: %s: Unknown filename suffix\n" % arg)
if options.objects and len(sources) > 1: if options.objects and len(sources) > 1:
print >>sys.stderr, \ sys.stderr.write(
"cython: Only one source file allowed together with .o files" "cython: Only one source file allowed together with .o files\n")
if options.use_listing_file and len(sources) > 1: if options.use_listing_file and len(sources) > 1:
print >>sys.stderr, \ sys.stderr.write(
"cython: Only one source file allowed when using -o" "cython: Only one source file allowed when using -o\n")
sys.exit(1) sys.exit(1)
if len(sources) == 0 and not options.show_version: if len(sources) == 0 and not options.show_version:
bad_usage() bad_usage()
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import os, sys, re, codecs import os, sys, re, codecs
if sys.version_info[:2] < (2, 2): if sys.version_info[:2] < (2, 2):
print >>sys.stderr, "Sorry, Cython requires Python 2.2 or later" sys.stderr.write("Sorry, Cython requires Python 2.2 or later\n")
sys.exit(1) sys.exit(1)
from time import time from time import time
...@@ -327,7 +327,7 @@ def main(command_line = 0): ...@@ -327,7 +327,7 @@ def main(command_line = 0):
options = default_options options = default_options
sources = args sources = args
if options.show_version: if options.show_version:
print >>sys.stderr, "Cython version %s" % Version.version sys.stderr.write("Cython version %s\n" % Version.version)
context = Context(options.include_path) context = Context(options.include_path)
for source in sources: for source in sources:
try: try:
...@@ -335,7 +335,7 @@ def main(command_line = 0): ...@@ -335,7 +335,7 @@ def main(command_line = 0):
if result.num_errors > 0: if result.num_errors > 0:
any_failures = 1 any_failures = 1
except PyrexError, e: except PyrexError, e:
print >>sys.stderr, e sys.stderr.write(str(e) + '\n')
any_failures = 1 any_failures = 1
if any_failures: if any_failures:
sys.exit(1) sys.exit(1)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# #
#======================================================================= #=======================================================================
from Regexps import * from Regexps import Alt, Seq, Rep, Rep1, Opt, Any, AnyBut, Bol, Eol, Char
from Errors import PlexError from Errors import PlexError
class RegexpSyntaxError(PlexError): class RegexpSyntaxError(PlexError):
...@@ -104,7 +104,7 @@ class REParser: ...@@ -104,7 +104,7 @@ class REParser:
char_list.append(chr(a)) char_list.append(chr(a))
else: else:
char_list.append(c1) char_list.append(c1)
chars = string.join(char_list, "") chars = ''.join(char_list)
if invert: if invert:
return AnyBut(chars) return AnyBut(chars)
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment