More Pyrex --> Cython conversions.

diff --git a/Cython/Compiler/CmdLine.py b/Cython/Compiler/CmdLine.py
index e3c603bce099d575f9a6b6958c5fa5c3f15e21cc..e0bd06bb73259f77f64ae6915891d5211eda4091 100644 (file)
--- a/Cython/Compiler/CmdLine.py
+++ b/Cython/Compiler/CmdLine.py
@@ -6,10 +6,10 @@ import sys
 import Options
 
 usage = """\
-Cython (http://cython.org) is for compiling code written in the Cython
-language.  Cython is based on Pyrex by Greg Ewing. 
+Cython (http://cython.org) is a compiler for code written in the
+Cython language.  Cython is based on Pyrex by Greg Ewing.
 
-Usage: cython [options] sourcefile...
+Usage: cython [options] sourcefile.pyx ...
 
 Options:
   -v, --version                  Display version number of cython compiler

diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py
index 719f027d94a5e4bc1237dbee6337c0dbfbd14a60..f665323ee4d4b896bbe902424ee504e27c306b62 100644 (file)
--- a/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@ -1,10 +1,10 @@
 #
-#   Pyrex Top Level
+#   Cython Top Level
 #
 
 import os, sys
 if sys.version_info[:2] < (2, 2):
-    print >>sys.stderr, "Sorry, Pyrex requires Python 2.2 or later"
+    print >>sys.stderr, "Sorry, Cython requires Python 2.2 or later"
     sys.exit(1)
 
 import os
@@ -217,7 +217,7 @@ class Context:
 
 class CompilationOptions:
     """
-    Options to the Pyrex compiler:
+    Options to the Cython compiler:
     
     show_version      boolean   Display version number
     use_listing_file  boolean   Generate a .lis file
@@ -243,7 +243,7 @@ class CompilationOptions:
 
 class CompilationResult:
     """
-    Results from the Pyrex compiler:
+    Results from the Cython compiler:
     
     c_file           string or None   The generated C source file
     h_file           string or None   The generated C header file
@@ -267,7 +267,7 @@ def compile(source, options = None, c_compile = 0, c_link = 0):
     """
     compile(source, options = default_options)
     
-    Compile the given Pyrex implementation file and return
+    Compile the given Cython implementation file and return
     a CompilationResult object describing what was produced.
     """
     if not options:
@@ -296,7 +296,7 @@ def main(command_line = 0):
         options = default_options
         sources = args
     if options.show_version:
-        print >>sys.stderr, "Pyrex version %s" % Version.version
+        print >>sys.stderr, "Cython version %s" % Version.version
     context = Context(options.include_path)
     for source in sources:
         try:

diff --git a/Cython/Compiler/Scanning.py b/Cython/Compiler/Scanning.py
index 1c73345044f02e6ddcf0d3672cbb534a088e6d45..a0de4bc36b108e6a84a5159919a1de5a32e19920 100644 (file)
--- a/Cython/Compiler/Scanning.py
+++ b/Cython/Compiler/Scanning.py
@@ -10,7 +10,7 @@ import stat
 import sys
 from time import time
 
-from Pyrex import Plex
+from Cython import Plex
 from Cython.Plex import Scanner
 from Cython.Plex.Errors import UnrecognizedInput
 from Errors import CompileError, error