From 004bb9e57fd63f3e53fe8e2ade261f25ade79fae Mon Sep 17 00:00:00 2001 From: William Stein Date: Sat, 28 Jul 2007 13:40:10 -0700 Subject: [PATCH] Changing Python. to Cython. --- Cython/Compiler/Code.py | 2 +- Cython/Compiler/Errors.py | 2 +- Cython/Compiler/ExprNodes.py | 2 +- Cython/Compiler/Lexicon.py | 2 +- Cython/Compiler/Main.py | 6 +++--- Cython/Compiler/ModuleNode.py | 2 +- Cython/Compiler/Nodes.py | 2 +- Cython/Compiler/Scanning.py | 4 ++-- Cython/Compiler/TypeSlots.py | 4 ++-- Cython/Distutils/build_ext.py | 6 +++--- Cython/Mac/DarwinSystem.py | 4 ++-- Cython/Mac/MacSystem.py | 4 ++-- Cython/Unix/LinuxSystem.py | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cython/Compiler/Code.py b/Cython/Compiler/Code.py index 5ba0f7a6..196c4172 100644 --- 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 f5652688..6b936b58 100644 --- 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 7edea447..f3eeeeb0 100644 --- 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 2e241c68..676f2036 100644 --- 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 01eb7a13..719f027d 100644 --- 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 28e74587..4fd310fc 100644 --- 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 3e70fc03..4dc7c45b 100644 --- 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 0d2d0ae9..1c733450 100644 --- 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 b8a05d73..530daa2c 100644 --- 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 95c0a745..2746280c 100644 --- 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 030dea0e..a3efd9f6 100644 --- 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 c29e0023..9af34d85 100644 --- 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 e9722ff7..466b61ec 100644 --- 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 = [ -- 2.26.2