Python fixes

diff --git a/Cython/Compiler/CmdLine.py b/Cython/Compiler/CmdLine.py
index 2c2a6d4f9b366d96cf94fd39d12bc61fd94620e2..05580e36e1ae32487c014db6caf50fd7813a0049 100644 (file)
--- a/Cython/Compiler/CmdLine.py
+++ b/Cython/Compiler/CmdLine.py
@@ -47,7 +47,7 @@ Options:
 #                   transforms for the same phase will be used in the order they are given.
 
 def bad_usage():
-    print >>sys.stderr, usage
+    sys.stderr.write(usage)
     sys.exit(1)
 
 def parse_command_line(args):
@@ -135,14 +135,14 @@ def parse_command_line(args):
             elif arg.endswith(".o"):
                 options.objects.append(arg)
             else:
-                print >>sys.stderr, \
-                    "cython: %s: Unknown filename suffix" % arg
+                sys.stderr.write(
+                    "cython: %s: Unknown filename suffix\n" % arg)
     if options.objects and len(sources) > 1:
-        print >>sys.stderr, \
-            "cython: Only one source file allowed together with .o files"
+        sys.stderr.write(
+            "cython: Only one source file allowed together with .o files\n")
     if options.use_listing_file and len(sources) > 1:
-        print >>sys.stderr, \
-            "cython: Only one source file allowed when using -o"
+        sys.stderr.write(
+            "cython: Only one source file allowed when using -o\n")
         sys.exit(1)
     if len(sources) == 0 and not options.show_version:
         bad_usage()

diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py
index c1ed7a01854fd4c2a0230589175e23165c7f5bbc..182e98b202555acdf3aa26a9b9687bb1a4f70145 100644 (file)
--- a/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@ -4,7 +4,7 @@
 
 import os, sys, re, codecs
 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)
 
 from time import time
@@ -327,7 +327,7 @@ def main(command_line = 0):
         options = default_options
         sources = args
     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)
     for source in sources:
         try:
@@ -335,7 +335,7 @@ def main(command_line = 0):
             if result.num_errors > 0:
                 any_failures = 1
         except PyrexError, e:
-            print >>sys.stderr, e
+            sys.stderr.write(str(e) + '\n')
             any_failures = 1
     if any_failures:
         sys.exit(1)

diff --git a/Cython/Plex/Traditional.py b/Cython/Plex/Traditional.py
index 4ba4bbbdb410975dc3236b96907e7118978eff39..1f6d672676aff3c00f70c096756137f7eb6ae1b3 100644 (file)
--- a/Cython/Plex/Traditional.py
+++ b/Cython/Plex/Traditional.py
@@ -6,7 +6,7 @@
 #
 #=======================================================================
 
-from Regexps import *
+from Regexps import Alt, Seq, Rep, Rep1, Opt, Any, AnyBut, Bol, Eol, Char
 from Errors import PlexError
 
 class RegexpSyntaxError(PlexError):
@@ -104,7 +104,7 @@ class REParser:
           char_list.append(chr(a))
       else:
         char_list.append(c1)
-    chars = string.join(char_list, "")
+    chars = ''.join(char_list)
     if invert:
       return AnyBut(chars)
     else: