Commit 004bb9e5 authored by William Stein's avatar William Stein

Changing Python. to Cython.

parent ee1b399f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import Naming import Naming
import Options import Options
from Pyrex.Utils import open_new_file from Cython.Utils import open_new_file
from PyrexTypes import py_object_type, typecast from PyrexTypes import py_object_type, typecast
class CCodeWriter: class CCodeWriter:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
import sys import sys
from Pyrex.Utils import open_new_file from Cython.Utils import open_new_file
class PyrexError(Exception): class PyrexError(Exception):
......
...@@ -12,7 +12,7 @@ from PyrexTypes import py_object_type, c_long_type, typecast ...@@ -12,7 +12,7 @@ from PyrexTypes import py_object_type, c_long_type, typecast
import Symtab import Symtab
import Options 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, \ from DebugFlags import debug_disposal_code, debug_temp_alloc, \
debug_coercion debug_coercion
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
string_prefixes = "cCrR" string_prefixes = "cCrR"
def make_lexicon(): def make_lexicon():
from Pyrex.Plex import \ from Cython.Plex import \
Str, Any, AnyBut, AnyChar, Rep, Rep1, Opt, Bol, Eol, Eof, \ Str, Any, AnyBut, AnyChar, Rep, Rep1, Opt, Bol, Eol, Eof, \
TEXT, IGNORE, State, Lexicon TEXT, IGNORE, State, Lexicon
from Scanning import Method from Scanning import Method
......
...@@ -16,7 +16,7 @@ from Errors import PyrexError, CompileError, error ...@@ -16,7 +16,7 @@ from Errors import PyrexError, CompileError, error
import Parsing import Parsing
from Symtab import BuiltinScope, ModuleScope from Symtab import BuiltinScope, ModuleScope
import Code import Code
from Pyrex.Utils import replace_suffix from Cython.Utils import replace_suffix
verbose = 0 verbose = 0
...@@ -325,10 +325,10 @@ default_options = CompilationOptions( ...@@ -325,10 +325,10 @@ default_options = CompilationOptions(
output_file = None) output_file = None)
if sys.platform == "mac": 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 default_options.use_listing_file = 1
elif sys.platform == "darwin": 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: else:
c_compile = None c_compile = None
c_link = None c_link = None
......
...@@ -15,7 +15,7 @@ import Version ...@@ -15,7 +15,7 @@ import Version
from Errors import error from Errors import error
from PyrexTypes import py_object_type 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): class ModuleNode(Nodes.Node, Nodes.BlockNode):
# doc string or None # doc string or None
......
...@@ -11,7 +11,7 @@ import PyrexTypes ...@@ -11,7 +11,7 @@ import PyrexTypes
from PyrexTypes import py_object_type, error_type, CTypedefType from PyrexTypes import py_object_type, error_type, CTypedefType
from Symtab import ModuleScope, LocalScope, \ from Symtab import ModuleScope, LocalScope, \
StructOrUnionScope, PyClassScope, CClassScope StructOrUnionScope, PyClassScope, CClassScope
from Pyrex.Utils import open_new_file, replace_suffix from Cython.Utils import open_new_file, replace_suffix
import Options import Options
from DebugFlags import debug_disposal_code from DebugFlags import debug_disposal_code
......
...@@ -11,8 +11,8 @@ import sys ...@@ -11,8 +11,8 @@ import sys
from time import time from time import time
from Pyrex import Plex from Pyrex import Plex
from Pyrex.Plex import Scanner from Cython.Plex import Scanner
from Pyrex.Plex.Errors import UnrecognizedInput from Cython.Plex.Errors import UnrecognizedInput
from Errors import CompileError, error from Errors import CompileError, error
from Lexicon import string_prefixes, make_lexicon from Lexicon import string_prefixes, make_lexicon
......
...@@ -179,7 +179,7 @@ class MethodSlot(SlotDescriptor): ...@@ -179,7 +179,7 @@ class MethodSlot(SlotDescriptor):
class InternalMethodSlot(SlotDescriptor): class InternalMethodSlot(SlotDescriptor):
# Type slot descriptor for a method which is always # 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 # slot_name string Member name of the slot in the type object
...@@ -574,7 +574,7 @@ slot_table = ( ...@@ -574,7 +574,7 @@ slot_table = (
# #
# Descriptors for special methods which don't appear directly # Descriptors for special methods which don't appear directly
# in the type object or its substructures. These methods are # in the type object or its substructures. These methods are
# called from slot functions synthesized by Pyrex. # called from slot functions synthesized by Cython.
# #
#------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
# Pyrex is (c) Greg Ewing. # Pyrex is (c) Greg Ewing.
import distutils.command.build_ext import distutils.command.build_ext
#import Pyrex.Compiler.Main #import Cython.Compiler.Main
from Pyrex.Compiler.Main import CompilationOptions, default_options, compile from Cython.Compiler.Main import CompilationOptions, default_options, compile
from Pyrex.Compiler.Errors import PyrexError from Cython.Compiler.Errors import PyrexError
from distutils.dep_util import newer from distutils.dep_util import newer
import os import os
import sys import sys
......
...@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True ...@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True
gcc_all_warnings = True gcc_all_warnings = True
import os import os
from Pyrex.Utils import replace_suffix from Cython.Utils import replace_suffix
from Pyrex.Compiler.Errors import PyrexError from Cython.Compiler.Errors import PyrexError
py_include_dirs = [ py_include_dirs = [
"/Library/Frameworks/Python.framework/Headers" "/Library/Frameworks/Python.framework/Headers"
......
...@@ -6,8 +6,8 @@ import os, sys, string ...@@ -6,8 +6,8 @@ import os, sys, string
import aetools import aetools
from aetools import TalkTo from aetools import TalkTo
from StdSuites.Standard_Suite import Standard_Suite_Events as Standard_Suite from StdSuites.Standard_Suite import Standard_Suite_Events as Standard_Suite
from Pyrex.Utils import replace_suffix from Cython.Utils import replace_suffix
from Pyrex.Compiler.Errors import PyrexError from Cython.Compiler.Errors import PyrexError
c_compiler = "MWCPPC" c_compiler = "MWCPPC"
c_optimizations = "off" c_optimizations = "off"
......
...@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True ...@@ -8,8 +8,8 @@ gcc_warnings_are_errors = True
gcc_all_warnings = True gcc_all_warnings = True
import os import os
from Pyrex.Utils import replace_suffix from Cython.Utils import replace_suffix
from Pyrex.Compiler.Errors import PyrexError from Cython.Compiler.Errors import PyrexError
version = "%s.%s" % sys.version[:2] version = "%s.%s" % sys.version[:2]
py_include_dirs = [ py_include_dirs = [
......
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