Changing Python. to Cython.

diff --git a/Cython/Compiler/Code.py b/Cython/Compiler/Code.py
index 5ba0f7a67ff3d29b2c7ae49d1521ad995698982f..196c4172e967f1a867a1c7d6fcfa98eb97db29da 100644 (file)
--- a/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@ -4,7 +4,7 @@
 
 import Naming
 import Options
-from Pyrex.Utils import open_new_file
+from Cython.Utils import open_new_file
 from PyrexTypes import py_object_type, typecast
 
 class CCodeWriter:

diff --git a/Cython/Compiler/Errors.py b/Cython/Compiler/Errors.py
index f56526880db7fc57e51ac0336f16652537733097..6b936b5845d078441de25c538df65fedcd688c33 100644 (file)
--- a/Cython/Compiler/Errors.py
+++ b/Cython/Compiler/Errors.py
@@ -3,7 +3,7 @@
 #
 
 import sys
-from Pyrex.Utils import open_new_file
+from Cython.Utils import open_new_file
 
 
 class PyrexError(Exception):

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 7edea44707fc7a5bade38cc3f6e2d755e8f49aa0..f3eeeeb0235cfa5af74285f1d5cf2613adcb1f5b 100644 (file)
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -12,7 +12,7 @@ from PyrexTypes import py_object_type, c_long_type, typecast
 import Symtab
 import Options
 
-from Pyrex.Debugging import print_call_chain
+from Cython.Debugging import print_call_chain
 from DebugFlags import debug_disposal_code, debug_temp_alloc, \
     debug_coercion
 

diff --git a/Cython/Compiler/Lexicon.py b/Cython/Compiler/Lexicon.py
index 2e241c6817fe634187228b9cfca92b09eab19561..676f2036e724a451760af3ad3a9be7ee70edf48e 100644 (file)
--- a/Cython/Compiler/Lexicon.py
+++ b/Cython/Compiler/Lexicon.py
@@ -8,7 +8,7 @@
 string_prefixes = "cCrR"
 
 def make_lexicon():
-    from Pyrex.Plex import \
+    from Cython.Plex import \
         Str, Any, AnyBut, AnyChar, Rep, Rep1, Opt, Bol, Eol, Eof, \
         TEXT, IGNORE, State, Lexicon
     from Scanning import Method

diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py
index 01eb7a1303a6399a39bd80f3c85a70d9dd2c2fb5..719f027d94a5e4bc1237dbee6337c0dbfbd14a60 100644 (file)
--- a/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@ -16,7 +16,7 @@ from Errors import PyrexError, CompileError, error
 import Parsing
 from Symtab import BuiltinScope, ModuleScope
 import Code
-from Pyrex.Utils import replace_suffix
+from Cython.Utils import replace_suffix
 
 verbose = 0
 
@@ -325,10 +325,10 @@ default_options = CompilationOptions(
     output_file = None)
     
 if sys.platform == "mac":
-    from Pyrex.Mac.MacSystem import c_compile, c_link, CCompilerError
+    from Cython.Mac.MacSystem import c_compile, c_link, CCompilerError
     default_options.use_listing_file = 1
 elif sys.platform == "darwin":
-    from Pyrex.Mac.DarwinSystem import c_compile, c_link, CCompilerError
+    from Cython.Mac.DarwinSystem import c_compile, c_link, CCompilerError
 else:
     c_compile = None
     c_link = None

diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py
index 28e74587ed0369975a897f9ddc97a09ad688e68a..4fd310fcc112ea13ae5fae01db6e88876a1c1089 100644 (file)
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@ -15,7 +15,7 @@ import Version
 
 from Errors import error
 from PyrexTypes import py_object_type
-from Pyrex.Utils import open_new_file, replace_suffix
+from Cython.Utils import open_new_file, replace_suffix
 
 class ModuleNode(Nodes.Node, Nodes.BlockNode):
     #  doc       string or None

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 3e70fc03971044393947cf1f1d178bce129e731a..4dc7c45bf6e5439febecf4c7747a0b00ea232d32 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -11,7 +11,7 @@ import PyrexTypes
 from PyrexTypes import py_object_type, error_type, CTypedefType
 from Symtab import ModuleScope, LocalScope, \
     StructOrUnionScope, PyClassScope, CClassScope
-from Pyrex.Utils import open_new_file, replace_suffix
+from Cython.Utils import open_new_file, replace_suffix
 import Options
 
 from DebugFlags import debug_disposal_code

diff --git a/Cython/Compiler/Scanning.py b/Cython/Compiler/Scanning.py
index 0d2d0ae9ee6b1f40b1b4d8c56ec8f5b3428348bf..1c73345044f02e6ddcf0d3672cbb534a088e6d45 100644 (file)
--- a/Cython/Compiler/Scanning.py
+++ b/Cython/Compiler/Scanning.py
@@ -11,8 +11,8 @@ import sys
 from time import time
 
 from Pyrex import Plex
-from Pyrex.Plex import Scanner
-from Pyrex.Plex.Errors import UnrecognizedInput
+from Cython.Plex import Scanner
+from Cython.Plex.Errors import UnrecognizedInput
 from Errors import CompileError, error
 from Lexicon import string_prefixes, make_lexicon
 

diff --git a/Cython/Compiler/TypeSlots.py b/Cython/Compiler/TypeSlots.py
index b8a05d73f556cfe483820cb6a50600ce37994d5f..530daa2c894f58ead0349a6be5efb775c1ea3c19 100644 (file)
--- a/Cython/Compiler/TypeSlots.py
+++ b/Cython/Compiler/TypeSlots.py
@@ -179,7 +179,7 @@ class MethodSlot(SlotDescriptor):
 
 class InternalMethodSlot(SlotDescriptor):
     #  Type slot descriptor for a method which is always
-    #  synthesized by Pyrex.
+    #  synthesized by Cython.
     #
     #  slot_name    string           Member name of the slot in the type object
 
@@ -574,7 +574,7 @@ slot_table = (
 #
 #  Descriptors for special methods which don't appear directly
 #  in the type object or its substructures. These methods are
-#  called from slot functions synthesized by Pyrex.
+#  called from slot functions synthesized by Cython.
 #
 #------------------------------------------------------------------------------------------
 

diff --git a/Cython/Distutils/build_ext.py b/Cython/Distutils/build_ext.py
index 95c0a745d897c4e113c4e9f14d31c51398e410c8..2746280c56e17fc6ac9f8880c0cb59ca71734e7c 100644 (file)
--- a/Cython/Distutils/build_ext.py
+++ b/Cython/Distutils/build_ext.py
@@ -7,9 +7,9 @@
 # Pyrex is (c) Greg Ewing.
 
 import distutils.command.build_ext
-#import Pyrex.Compiler.Main
-from Pyrex.Compiler.Main import CompilationOptions, default_options, compile
-from Pyrex.Compiler.Errors import PyrexError
+#import Cython.Compiler.Main
+from Cython.Compiler.Main import CompilationOptions, default_options, compile
+from Cython.Compiler.Errors import PyrexError
 from distutils.dep_util import newer
 import os
 import sys

diff --git a/Cython/Mac/DarwinSystem.py b/Cython/Mac/DarwinSystem.py
index 030dea0ed67a80c88be8ba5dabee8a931540763c..a3efd9f66bfb9b9b7fbbdee7ab07aa205e12b772 100644 (file)
--- a/Cython/Mac/DarwinSystem.py
+++ b/Cython/Mac/DarwinSystem.py
@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True
 gcc_all_warnings = True
 
 import os
-from Pyrex.Utils import replace_suffix
-from Pyrex.Compiler.Errors import PyrexError
+from Cython.Utils import replace_suffix
+from Cython.Compiler.Errors import PyrexError
 
 py_include_dirs = [
     "/Library/Frameworks/Python.framework/Headers"

diff --git a/Cython/Mac/MacSystem.py b/Cython/Mac/MacSystem.py
index c29e00230a2c3e77e27f8c4d04c40b8169eafc5a..9af34d85a4535c24fad75137725d1a9df6523144 100644 (file)
--- a/Cython/Mac/MacSystem.py
+++ b/Cython/Mac/MacSystem.py
@@ -6,8 +6,8 @@ import os, sys, string
 import aetools
 from aetools import TalkTo
 from StdSuites.Standard_Suite import Standard_Suite_Events as Standard_Suite
-from Pyrex.Utils import replace_suffix
-from Pyrex.Compiler.Errors import PyrexError
+from Cython.Utils import replace_suffix
+from Cython.Compiler.Errors import PyrexError
 
 c_compiler = "MWCPPC"
 c_optimizations = "off"

diff --git a/Cython/Unix/LinuxSystem.py b/Cython/Unix/LinuxSystem.py
index e9722ff79b0e8bd151e810a36c8642e6f823da11..466b61ec5fee764b52c594ee315c4b82987d3996 100644 (file)
--- a/Cython/Unix/LinuxSystem.py
+++ b/Cython/Unix/LinuxSystem.py
@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True
 gcc_all_warnings = True
 
 import os
-from Pyrex.Utils import replace_suffix
-from Pyrex.Compiler.Errors import PyrexError
+from Cython.Utils import replace_suffix
+from Cython.Compiler.Errors import PyrexError
 
 version = "%s.%s" % sys.version[:2]
 py_include_dirs = [