projects
/
cython.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b0e49f
)
pre-Py3k fixes
author
Stefan Behnel
<scoder@users.berlios.de>
Sun, 2 Mar 2008 11:29:08 +0000
(12:29 +0100)
committer
Stefan Behnel
<scoder@users.berlios.de>
Sun, 2 Mar 2008 11:29:08 +0000
(12:29 +0100)
20 files changed:
Cython/Compiler/Code.py
patch
|
blob
|
history
Cython/Compiler/ExprNodes.py
patch
|
blob
|
history
Cython/Compiler/Main.py
patch
|
blob
|
history
Cython/Compiler/ModuleNode.py
patch
|
blob
|
history
Cython/Compiler/Nodes.py
patch
|
blob
|
history
Cython/Compiler/Parsing.py
patch
|
blob
|
history
Cython/Compiler/PyrexTypes.py
patch
|
blob
|
history
Cython/Compiler/Scanning.py
patch
|
blob
|
history
Cython/Compiler/Symtab.py
patch
|
blob
|
history
Cython/Compiler/TypeSlots.py
patch
|
blob
|
history
Cython/Debugging.py
patch
|
blob
|
history
Cython/Mac/DarwinSystem.py
patch
|
blob
|
history
Cython/Mac/MacSystem.py
patch
|
blob
|
history
Cython/Plex/Lexicons.py
patch
|
blob
|
history
Cython/Plex/Machines.py
patch
|
blob
|
history
Cython/Plex/Regexps.py
patch
|
blob
|
history
Cython/Plex/Scanners.py
patch
|
blob
|
history
Cython/Plex/Traditional.py
patch
|
blob
|
history
Cython/Plex/Transitions.py
patch
|
blob
|
history
Cython/Unix/LinuxSystem.py
patch
|
blob
|
history
diff --git
a/Cython/Compiler/Code.py
b/Cython/Compiler/Code.py
index ea5fcb6ce625ad9ecad43b22a52406396327b8b1..41347567fdbf3ef24b07b86c79bfc10925b99dbb 100644
(file)
--- a/
Cython/Compiler/Code.py
+++ b/
Cython/Compiler/Code.py
@@
-210,7
+210,7
@@
class CCodeWriter:
storage_class = "static"
if storage_class:
self.put("%s " % storage_class)
storage_class = "static"
if storage_class:
self.put("%s " % storage_class)
- if visibility
<>
'public':
+ if visibility
!=
'public':
dll_linkage = None
self.put(entry.type.declaration_code(entry.cname,
dll_linkage = dll_linkage))
dll_linkage = None
self.put(entry.type.declaration_code(entry.cname,
dll_linkage = dll_linkage))
diff --git
a/Cython/Compiler/ExprNodes.py
b/Cython/Compiler/ExprNodes.py
index ca3c052fc576aa76ff704d329ae2a9d2f6836937..f95d45c876688f50f8e1f651f0b200156b948799 100644
(file)
--- a/
Cython/Compiler/ExprNodes.py
+++ b/
Cython/Compiler/ExprNodes.py
@@
-311,7
+311,7
@@
class ExprNode(Node):
def allocate_target_temps(self, env, rhs):
# Perform temp allocation for the LHS of an assignment.
if debug_temp_alloc:
def allocate_target_temps(self, env, rhs):
# Perform temp allocation for the LHS of an assignment.
if debug_temp_alloc:
- print
self, "Allocating target temps"
+ print
("%s Allocating target temps" % self)
self.allocate_subexpr_temps(env)
self.result_code = self.target_code()
if rhs:
self.allocate_subexpr_temps(env)
self.result_code = self.target_code()
if rhs:
@@
-325,7
+325,7
@@
class ExprNode(Node):
# is used as the result instead of allocating a new
# one.
if debug_temp_alloc:
# is used as the result instead of allocating a new
# one.
if debug_temp_alloc:
- print
self, "Allocating temps"
+ print
("%s Allocating temps" % self)
self.allocate_subexpr_temps(env)
self.allocate_temp(env, result)
if self.is_temp:
self.allocate_subexpr_temps(env)
self.allocate_temp(env, result)
if self.is_temp:
@@
-335,11
+335,11
@@
class ExprNode(Node):
# Allocate temporary variables for all sub-expressions
# of this node.
if debug_temp_alloc:
# Allocate temporary variables for all sub-expressions
# of this node.
if debug_temp_alloc:
- print
self, "Allocating temps for:", self.subexprs
+ print
("%s Allocating temps for: %s" % (self, self.subexprs))
for node in self.subexpr_nodes():
if node:
if debug_temp_alloc:
for node in self.subexpr_nodes():
if node:
if debug_temp_alloc:
- print
self, "Allocating temps for", node
+ print
("%s Allocating temps for %s" % (self, node))
node.allocate_temps(env)
def allocate_temp(self, env, result = None):
node.allocate_temps(env)
def allocate_temp(self, env, result = None):
@@
-350,7
+350,7
@@
class ExprNode(Node):
# is used as the result instead of allocating a new
# one.
if debug_temp_alloc:
# is used as the result instead of allocating a new
# one.
if debug_temp_alloc:
- print
self, "Allocating temp"
+ print
("%s Allocating temp" % self)
if result:
if not self.is_temp:
raise InternalError("Result forced on non-temp node")
if result:
if not self.is_temp:
raise InternalError("Result forced on non-temp node")
@@
-364,7
+364,7
@@
class ExprNode(Node):
else:
self.result_code = None
if debug_temp_alloc:
else:
self.result_code = None
if debug_temp_alloc:
- print
self, "Allocated result", self.result_code
+ print
("%s Allocated result %s" % (self, self.result_code))
else:
self.result_code = self.calculate_result_code()
else:
self.result_code = self.calculate_result_code()
@@
-384,7
+384,7
@@
class ExprNode(Node):
# otherwise release results of its sub-expressions.
if self.is_temp:
if debug_temp_alloc:
# otherwise release results of its sub-expressions.
if self.is_temp:
if debug_temp_alloc:
- print
self, "Releasing result", self.result_code
+ print
("%s Releasing result %s" % (self, self.result_code))
env.release_temp(self.result_code)
else:
self.release_subexpr_temps(env)
env.release_temp(self.result_code)
else:
self.release_subexpr_temps(env)
@@
-971,8
+971,8
@@
class NameNode(AtomicExprNode):
entry.name,
rhs.py_result()))
if debug_disposal_code:
entry.name,
rhs.py_result()))
if debug_disposal_code:
- print
"NameNode.generate_assignment_code:"
- print
"...generating disposal code for", rhs
+ print
("NameNode.generate_assignment_code:")
+ print
("...generating disposal code for %s" % rhs)
rhs.generate_disposal_code(code)
else:
rhs.generate_disposal_code(code)
else:
@@
-985,8
+985,8
@@
class NameNode(AtomicExprNode):
code.put_decref(self.result_code, self.ctype())
code.putln('%s = %s;' % (self.result_code, rhs.result_as(self.ctype())))
if debug_disposal_code:
code.put_decref(self.result_code, self.ctype())
code.putln('%s = %s;' % (self.result_code, rhs.result_as(self.ctype())))
if debug_disposal_code:
- print
"NameNode.generate_assignment_code:"
- print
"...generating post-assignment code for", rhs
+ print
("NameNode.generate_assignment_code:")
+ print
("...generating post-assignment code for %s" % rhs)
rhs.generate_post_assignment_code(code)
def generate_deletion_code(self, code):
rhs.generate_post_assignment_code(code)
def generate_deletion_code(self, code):
@@
-2147,8
+2147,8
@@
class SequenceNode(ExprNode):
"__Pyx_EndUnpack(%s)" % (
self.iterator.py_result()))
if debug_disposal_code:
"__Pyx_EndUnpack(%s)" % (
self.iterator.py_result()))
if debug_disposal_code:
- print
"UnpackNode.generate_assignment_code:"
- print
"...generating disposal code for", iterator
+ print
("UnpackNode.generate_assignment_code:")
+ print
("...generating disposal code for %s" % iterator)
self.iterator.generate_disposal_code(code)
code.putln("}")
self.iterator.generate_disposal_code(code)
code.putln("}")
@@
-2255,7
+2255,7
@@
class ListComprehensionNode(SequenceNode):
def allocate_temps(self, env, result = None):
if debug_temp_alloc:
def allocate_temps(self, env, result = None):
if debug_temp_alloc:
- print
self, "Allocating temps"
+ print
("%s Allocating temps" % self)
self.allocate_temp(env, result)
self.loop.analyse_declarations(env)
self.loop.analyse_expressions(env)
self.allocate_temp(env, result)
self.loop.analyse_declarations(env)
self.loop.analyse_expressions(env)
@@
-3551,7
+3551,7
@@
class CoercionNode(ExprNode):
self.pos = arg.pos
self.arg = arg
if debug_coercion:
self.pos = arg.pos
self.arg = arg
if debug_coercion:
- print
self, "Coercing", self.arg
+ print
("%s Coercing %s" % (self, self.arg))
def annotate(self, code):
self.arg.annotate(code)
def annotate(self, code):
self.arg.annotate(code)
diff --git
a/Cython/Compiler/Main.py
b/Cython/Compiler/Main.py
index 55fb7baa64d4909fd37a1f485485a0633bd70aaf..9e157332a2e1573ff3e6bc845c4e4c28d12fa030 100644
(file)
--- a/
Cython/Compiler/Main.py
+++ b/
Cython/Compiler/Main.py
@@
-48,13
+48,13
@@
class Context:
# that module, provided its name is not a dotted name.
debug_find_module = 0
if debug_find_module:
# that module, provided its name is not a dotted name.
debug_find_module = 0
if debug_find_module:
- print
"Context.find_module: module_name =", module_name, \
- "relative_to =", relative_to, "pos =", pos, "need_pxd =", need_pxd
+ print
("Context.find_module: module_name = %s, relative_to = %s, pos = %s, need_pxd = %s" % (
+ module_name, relative_to, pos, need_pxd))
scope = None
pxd_pathname = None
if "." not in module_name and relative_to:
if debug_find_module:
scope = None
pxd_pathname = None
if "." not in module_name and relative_to:
if debug_find_module:
- print
"...trying relative import"
+ print
("...trying relative import")
scope = relative_to.lookup_submodule(module_name)
if not scope:
qualified_name = relative_to.qualify_name(module_name)
scope = relative_to.lookup_submodule(module_name)
if not scope:
qualified_name = relative_to.qualify_name(module_name)
@@
-63,28
+63,28
@@
class Context:
scope = relative_to.find_submodule(module_name)
if not scope:
if debug_find_module:
scope = relative_to.find_submodule(module_name)
if not scope:
if debug_find_module:
- print
"...trying absolute import"
+ print
("...trying absolute import")
scope = self
for name in module_name.split("."):
scope = scope.find_submodule(name)
if debug_find_module:
scope = self
for name in module_name.split("."):
scope = scope.find_submodule(name)
if debug_find_module:
- print
"...scope =", scope
+ print
("...scope =", scope)
if not scope.pxd_file_loaded:
if debug_find_module:
if not scope.pxd_file_loaded:
if debug_find_module:
- print
"...pxd not loaded"
+ print
("...pxd not loaded")
scope.pxd_file_loaded = 1
if not pxd_pathname:
if debug_find_module:
scope.pxd_file_loaded = 1
if not pxd_pathname:
if debug_find_module:
- print
"...looking for pxd file"
+ print
("...looking for pxd file")
pxd_pathname = self.find_pxd_file(module_name, pos)
if debug_find_module:
pxd_pathname = self.find_pxd_file(module_name, pos)
if debug_find_module:
- print
"......found ", pxd_pathname
+ print
("......found ", pxd_pathname)
if not pxd_pathname and need_pxd:
error(pos, "'%s.pxd' not found" % module_name)
if pxd_pathname:
try:
if debug_find_module:
if not pxd_pathname and need_pxd:
error(pos, "'%s.pxd' not found" % module_name)
if pxd_pathname:
try:
if debug_find_module:
- print
"Context.find_module: Parsing", pxd_pathname
+ print
("Context.find_module: Parsing %s" % pxd_pathname)
pxd_tree = self.parse(pxd_pathname, scope.type_names, pxd = 1,
full_module_name = module_name)
pxd_tree.analyse_declarations(scope)
pxd_tree = self.parse(pxd_pathname, scope.type_names, pxd = 1,
full_module_name = module_name)
pxd_tree.analyse_declarations(scope)
diff --git
a/Cython/Compiler/ModuleNode.py
b/Cython/Compiler/ModuleNode.py
index 1d7874cde2bc96cd003334c6f8fc075c19ac424f..f05562448f40741db5b4a642332d18aeae8c559c 100644
(file)
--- a/
Cython/Compiler/ModuleNode.py
+++ b/
Cython/Compiler/ModuleNode.py
@@
-562,7
+562,7
@@
class ModuleNode(Nodes.Node, Nodes.BlockNode):
for entry in env.c_class_entries:
#print "generate_typeobj_definitions:", entry.name
#print "...visibility =", entry.visibility
for entry in env.c_class_entries:
#print "generate_typeobj_definitions:", entry.name
#print "...visibility =", entry.visibility
- if entry.visibility
<>
'extern':
+ if entry.visibility
!=
'extern':
type = entry.type
scope = type.scope
if scope: # could be None if there was an error
type = entry.type
scope = type.scope
if scope: # could be None if there was an error
@@
-681,7
+681,7
@@
class ModuleNode(Nodes.Node, Nodes.BlockNode):
% scope.mangle_internal("tp_dealloc"))
py_attrs = []
for entry in scope.var_entries:
% scope.mangle_internal("tp_dealloc"))
py_attrs = []
for entry in scope.var_entries:
- if entry.type.is_pyobject and entry.name
<>
"__weakref__":
+ if entry.type.is_pyobject and entry.name
!=
"__weakref__":
py_attrs.append(entry)
if py_attrs or scope.lookup_here("__weakref__"):
self.generate_self_cast(scope, code)
py_attrs.append(entry)
if py_attrs or scope.lookup_here("__weakref__"):
self.generate_self_cast(scope, code)
@@
-1520,7
+1520,7
@@
class ModuleNode(Nodes.Node, Nodes.BlockNode):
def generate_base_type_import_code(self, env, entry, code):
base_type = entry.type.base_type
def generate_base_type_import_code(self, env, entry, code):
base_type = entry.type.base_type
- if base_type and base_type.module_name
<>
env.qualified_name:
+ if base_type and base_type.module_name
!=
env.qualified_name:
self.generate_type_import_code(env, base_type, self.pos, code)
def use_type_import_utility_code(self, env):
self.generate_type_import_code(env, base_type, self.pos, code)
def use_type_import_utility_code(self, env):
@@
-1569,7
+1569,7
@@
class ModuleNode(Nodes.Node, Nodes.BlockNode):
typeobj_cname = type.typeobj_cname
scope = type.scope
if scope: # could be None if there was an error
typeobj_cname = type.typeobj_cname
scope = type.scope
if scope: # could be None if there was an error
- if entry.visibility
<>
'extern':
+ if entry.visibility
!=
'extern':
for slot in TypeSlots.slot_table:
slot.generate_dynamic_init_code(scope, code)
code.putln(
for slot in TypeSlots.slot_table:
slot.generate_dynamic_init_code(scope, code)
code.putln(
diff --git
a/Cython/Compiler/Nodes.py
b/Cython/Compiler/Nodes.py
index 2b2e3ce2a2257d0943c81200f118dbfcc0a5eaed..ccb3ee1fff7fdbaa645395fe3d843966ff07d594 100644
(file)
--- a/
Cython/Compiler/Nodes.py
+++ b/
Cython/Compiler/Nodes.py
@@
-943,7
+943,7
@@
class CFuncDefNode(FuncDefNode):
dll_linkage = None
header = self.return_type.declaration_code(entity,
dll_linkage = dll_linkage)
dll_linkage = None
header = self.return_type.declaration_code(entity,
dll_linkage = dll_linkage)
- if visibility
<>
'private':
+ if visibility
!=
'private':
storage_class = "%s " % Naming.extern_c_macro
else:
storage_class = "static "
storage_class = "%s " % Naming.extern_c_macro
else:
storage_class = "static "
@@
-3148,7
+3148,7
@@
class TryFinallyStatNode(StatNode):
"__pyx_why = 0; goto %s;" % catch_label)
for i in cases_used:
new_label = new_labels[i]
"__pyx_why = 0; goto %s;" % catch_label)
for i in cases_used:
new_label = new_labels[i]
- #if new_label and new_label
<>
"<try>":
+ #if new_label and new_label
!=
"<try>":
if new_label == new_error_label and self.preserve_exception:
self.put_error_catcher(code,
new_error_label, i+1, catch_label)
if new_label == new_error_label and self.preserve_exception:
self.put_error_catcher(code,
new_error_label, i+1, catch_label)
diff --git
a/Cython/Compiler/Parsing.py
b/Cython/Compiler/Parsing.py
index 7a9444c444dbc6903a854ab7d3313e46d1c0d0ae..5a684204bfbfe4955170e30fd5651c235bb156a5 100644
(file)
--- a/
Cython/Compiler/Parsing.py
+++ b/
Cython/Compiler/Parsing.py
@@
-24,7
+24,7
@@
def p_ident_list(s):
while s.sy == 'IDENT':
names.append(s.systring)
s.next()
while s.sy == 'IDENT':
names.append(s.systring)
s.next()
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
return names
break
s.next()
return names
@@
-290,7
+290,7
@@
def p_call(s, function):
s.error("Non-keyword arg following keyword arg",
pos = arg.pos)
positional_args.append(arg)
s.error("Non-keyword arg following keyword arg",
pos = arg.pos)
positional_args.append(arg)
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
if s.sy == '*':
break
s.next()
if s.sy == '*':
@@
-376,11
+376,11
@@
def p_subscript(s):
return [ExprNodes.EllipsisNode(pos)]
else:
start = p_slice_element(s, (':',))
return [ExprNodes.EllipsisNode(pos)]
else:
start = p_slice_element(s, (':',))
- if s.sy
<>
':':
+ if s.sy
!=
':':
return [start]
s.next()
stop = p_slice_element(s, (':', ',', ']'))
return [start]
s.next()
stop = p_slice_element(s, (':', ',', ']'))
- if s.sy
<>
':':
+ if s.sy
!=
':':
return [start, stop]
s.next()
step = p_slice_element(s, (':', ',', ']'))
return [start, stop]
s.next()
step = p_slice_element(s, (':', ',', ']'))
@@
-508,7
+508,7
@@
def p_cat_string_literal(s):
# A sequence of one or more adjacent string literals.
# Returns (kind, value) where kind in ('', 'c', 'r')
kind, value = p_string_literal(s)
# A sequence of one or more adjacent string literals.
# Returns (kind, value) where kind in ('', 'c', 'r')
kind, value = p_string_literal(s)
- if kind
<>
'c':
+ if kind
!=
'c':
strings = [value]
while s.sy == 'STRING' or s.sy == 'BEGIN_STRING':
next_kind, next_value = p_string_literal(s)
strings = [value]
while s.sy == 'STRING' or s.sy == 'BEGIN_STRING':
next_kind, next_value = p_string_literal(s)
@@
-608,7
+608,7
@@
def unquote(s):
# Split into double quotes, newlines, escape sequences
# and spans of regular chars
l1 = re.split(r'((?:\\[0-7]{1,3})|(?:\\x[0-9A-Fa-f]{2})|(?:\\.)|(?:\\\n)|(?:\n)|")', s)
# Split into double quotes, newlines, escape sequences
# and spans of regular chars
l1 = re.split(r'((?:\\[0-7]{1,3})|(?:\\x[0-9A-Fa-f]{2})|(?:\\.)|(?:\\\n)|(?:\n)|")', s)
- print "unquote: l1 =", l1 ###
+
#
print "unquote: l1 =", l1 ###
l2 = []
for item in l1:
if item == '"' or item == '\n':
l2 = []
for item in l1:
if item == '"' or item == '\n':
@@
-697,12
+697,12
@@
def p_dict_maker(s):
pos = s.position()
s.next()
items = []
pos = s.position()
s.next()
items = []
- while s.sy
<>
'}':
+ while s.sy
!=
'}':
key = p_simple_expr(s)
s.expect(':')
value = p_simple_expr(s)
items.append((key, value))
key = p_simple_expr(s)
s.expect(':')
value = p_simple_expr(s)
items.append((key, value))
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
s.expect('}')
break
s.next()
s.expect('}')
@@
-720,7
+720,7
@@
def p_simple_expr_list(s):
exprs = []
while s.sy not in expr_terminators:
exprs.append(p_simple_expr(s))
exprs = []
while s.sy not in expr_terminators:
exprs.append(p_simple_expr(s))
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
return exprs
break
s.next()
return exprs
@@
-832,7
+832,7
@@
def find_parallel_assignment_size(input):
rhs_size = len(rhs.args)
for lhs in input[:-1]:
lhs_size = len(lhs.args)
rhs_size = len(rhs.args)
for lhs in input[:-1]:
lhs_size = len(lhs.args)
- if lhs_size
<>
rhs_size:
+ if lhs_size
!=
rhs_size:
error(lhs.pos, "Unpacking sequence of wrong size (expected %d, got %d)"
% (lhs_size, rhs_size))
return -1
error(lhs.pos, "Unpacking sequence of wrong size (expected %d, got %d)"
% (lhs_size, rhs_size))
return -1
@@
-1094,10
+1094,10
@@
def p_for_bounds(s):
if not target.is_name:
error(target.pos,
"Target of for-from statement must be a variable name")
if not target.is_name:
error(target.pos,
"Target of for-from statement must be a variable name")
- elif name2
<>
target.name:
+ elif name2
!=
target.name:
error(name2_pos,
"Variable name in for-from range does not match target")
error(name2_pos,
"Variable name in for-from range does not match target")
- if rel1[0]
<>
rel2[0]:
+ if rel1[0]
!=
rel2[0]:
error(rel2_pos,
"Relation directions in for-from do not match")
return {'target': target,
error(rel2_pos,
"Relation directions in for-from do not match")
return {'target': target,
@@
-1131,9
+1131,9
@@
def p_for_target(s):
if s.sy == ',':
s.next()
exprs = [expr]
if s.sy == ',':
s.next()
exprs = [expr]
- while s.sy
<>
'in':
+ while s.sy
!=
'in':
exprs.append(p_bit_expr(s))
exprs.append(p_bit_expr(s))
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
return ExprNodes.TupleNode(pos, args = exprs)
break
s.next()
return ExprNodes.TupleNode(pos, args = exprs)
@@
-1175,7
+1175,7
@@
def p_except_clause(s):
s.next()
exc_type = None
exc_value = None
s.next()
exc_type = None
exc_value = None
- if s.sy
<>
':':
+ if s.sy
!=
':':
exc_type = p_simple_expr(s)
if s.sy == ',':
s.next()
exc_type = p_simple_expr(s)
if s.sy == ',':
s.next()
@@
-1295,7
+1295,7
@@
def p_IF_statement(s, level, cdef_flag, visibility, api):
if s.compile_time_eval:
result = body
current_eval = 0
if s.compile_time_eval:
result = body
current_eval = 0
- if s.sy
<>
'ELIF':
+ if s.sy
!=
'ELIF':
break
if s.sy == 'ELSE':
s.next()
break
if s.sy == 'ELSE':
s.next()
@@
-1346,7
+1346,7
@@
def p_statement(s, level, cdef_flag = 0, visibility = 'private', api = 0):
s.level = level
return p_def_statement(s)
elif s.sy == 'class':
s.level = level
return p_def_statement(s)
elif s.sy == 'class':
- if level
<>
'module':
+ if level
!=
'module':
s.error("class definition not allowed here")
return p_class_statement(s)
elif s.sy == 'include':
s.error("class definition not allowed here")
return p_class_statement(s)
elif s.sy == 'include':
@@
-1355,7
+1355,7
@@
def p_statement(s, level, cdef_flag = 0, visibility = 'private', api = 0):
return p_include_statement(s, level)
elif level == 'c_class' and s.sy == 'IDENT' and s.systring == 'property':
return p_property_decl(s)
return p_include_statement(s, level)
elif level == 'c_class' and s.sy == 'IDENT' and s.systring == 'property':
return p_property_decl(s)
- elif s.sy == 'pass' and level
<>
'property':
+ elif s.sy == 'pass' and level
!=
'property':
return p_pass_statement(s, with_newline = 1)
else:
if level in ('c_class_pxd', 'property'):
return p_pass_statement(s, with_newline = 1)
else:
if level in ('c_class_pxd', 'property'):
@@
-1541,7
+1541,7
@@
def p_c_declarator(s, empty = 0, is_type = 0, cmethod_flag = 0, assignable = 0,
s.expect(')')
else:
result = p_c_simple_declarator(s, empty, is_type, cmethod_flag, assignable, nonempty)
s.expect(')')
else:
result = p_c_simple_declarator(s, empty, is_type, cmethod_flag, assignable, nonempty)
- if not calling_convention_allowed and result.calling_convention and s.sy
<>
'(':
+ if not calling_convention_allowed and result.calling_convention and s.sy
!=
'(':
error(s.position(), "%s on something that is not a function"
% result.calling_convention)
while s.sy in ('[', '('):
error(s.position(), "%s on something that is not a function"
% result.calling_convention)
while s.sy in ('[', '('):
@@
-1557,7
+1557,7
@@
def p_c_declarator(s, empty = 0, is_type = 0, cmethod_flag = 0, assignable = 0,
def p_c_array_declarator(s, base):
pos = s.position()
s.next() # '['
def p_c_array_declarator(s, base):
pos = s.position()
s.next() # '['
- if s.sy
<>
']':
+ if s.sy
!=
']':
dim = p_expr(s)
else:
dim = None
dim = p_expr(s)
else:
dim = None
@@
-1791,7
+1791,7
@@
def p_c_enum_definition(s, pos, level, visibility, typedef_flag = 0):
items = None
s.expect(':')
items = []
items = None
s.expect(':')
items = []
- if s.sy
<>
'NEWLINE':
+ if s.sy
!=
'NEWLINE':
p_c_enum_line(s, items)
else:
s.next() # 'NEWLINE'
p_c_enum_line(s, items)
else:
s.next() # 'NEWLINE'
@@
-1804,7
+1804,7
@@
def p_c_enum_definition(s, pos, level, visibility, typedef_flag = 0):
in_pxd = level == 'module_pxd')
def p_c_enum_line(s, items):
in_pxd = level == 'module_pxd')
def p_c_enum_line(s, items):
- if s.sy
<>
'pass':
+ if s.sy
!=
'pass':
p_c_enum_item(s, items)
while s.sy == ',':
s.next()
p_c_enum_item(s, items)
while s.sy == ',':
s.next()
@@
-1839,8
+1839,8
@@
def p_c_struct_or_union_definition(s, pos, level, visibility, typedef_flag = 0):
s.expect('NEWLINE')
s.expect_indent()
attributes = []
s.expect('NEWLINE')
s.expect_indent()
attributes = []
- while s.sy
<>
'DEDENT':
- if s.sy
<>
'pass':
+ while s.sy
!=
'DEDENT':
+ if s.sy
!=
'pass':
attributes.append(
p_c_func_or_var_declaration(s, level = 'other', pos = s.position()))
else:
attributes.append(
p_c_func_or_var_declaration(s, level = 'other', pos = s.position()))
else:
@@
-1859,7
+1859,7
@@
def p_visibility(s, prev_visibility):
visibility = prev_visibility
if s.sy == 'IDENT' and s.systring in ('extern', 'public', 'readonly'):
visibility = s.systring
visibility = prev_visibility
if s.sy == 'IDENT' and s.systring in ('extern', 'public', 'readonly'):
visibility = s.systring
- if prev_visibility
<> 'private' and visibility <>
prev_visibility:
+ if prev_visibility
!= 'private' and visibility !=
prev_visibility:
s.error("Conflicting visibility options '%s' and '%s'"
% (prev_visibility, visibility))
s.next()
s.error("Conflicting visibility options '%s' and '%s'"
% (prev_visibility, visibility))
s.next()
@@
-1997,7
+1997,7
@@
def p_c_class_definition(s, level, pos,
s.next()
module_path.append(class_name)
class_name = p_ident(s)
s.next()
module_path.append(class_name)
class_name = p_ident(s)
- if module_path and visibility
<>
'extern':
+ if module_path and visibility
!=
'extern':
error(pos, "Qualified class name only allowed for 'extern' C class")
if module_path and s.sy == 'IDENT' and s.systring == 'as':
s.next()
error(pos, "Qualified class name only allowed for 'extern' C class")
if module_path and s.sy == 'IDENT' and s.systring == 'as':
s.next()
@@
-2069,7
+2069,7
@@
def p_c_class_options(s):
typeobj_name = None
s.expect('[')
while 1:
typeobj_name = None
s.expect('[')
while 1:
- if s.sy
<>
'IDENT':
+ if s.sy
!=
'IDENT':
break
if s.systring == 'object':
s.next()
break
if s.systring == 'object':
s.next()
@@
-2077,7
+2077,7
@@
def p_c_class_options(s):
elif s.systring == 'type':
s.next()
typeobj_name = p_ident(s)
elif s.systring == 'type':
s.next()
typeobj_name = p_ident(s)
- if s.sy
<>
',':
+ if s.sy
!=
',':
break
s.next()
s.expect(']', "Expected 'object' or 'type'")
break
s.next()
s.expect(']', "Expected 'object' or 'type'")
@@
-2093,7
+2093,7
@@
def p_property_decl(s):
def p_doc_string(s):
if s.sy == 'STRING' or s.sy == 'BEGIN_STRING':
_, result = p_cat_string_literal(s)
def p_doc_string(s):
if s.sy == 'STRING' or s.sy == 'BEGIN_STRING':
_, result = p_cat_string_literal(s)
- if s.sy
<>
'EOF':
+ if s.sy
!=
'EOF':
s.expect_newline("Syntax error in doc string")
return result
else:
s.expect_newline("Syntax error in doc string")
return result
else:
@@
-2108,7
+2108,7
@@
def p_module(s, pxd, full_module_name):
else:
level = 'module'
body = p_statement_list(s, level)
else:
level = 'module'
body = p_statement_list(s, level)
- if s.sy
<>
'EOF':
+ if s.sy
!=
'EOF':
s.error("Syntax error in statement [%s,%s]" % (
repr(s.sy), repr(s.systring)))
return ModuleNode(pos, doc = doc, body = body, full_module_name = full_module_name)
s.error("Syntax error in statement [%s,%s]" % (
repr(s.sy), repr(s.systring)))
return ModuleNode(pos, doc = doc, body = body, full_module_name = full_module_name)
@@
-2140,7
+2140,7
@@
def print_parse_tree(f, node, level, key = None):
tag = node.__class__.__name__
f.write("%s @ %s\n" % (tag, node.pos))
for name, value in node.__dict__.items():
tag = node.__class__.__name__
f.write("%s @ %s\n" % (tag, node.pos))
for name, value in node.__dict__.items():
- if name
<> 'tag' and name <>
'pos':
+ if name
!= 'tag' and name !=
'pos':
print_parse_tree(f, value, level+1, name)
return
elif t == ListType:
print_parse_tree(f, value, level+1, name)
return
elif t == ListType:
diff --git
a/Cython/Compiler/PyrexTypes.py
b/Cython/Compiler/PyrexTypes.py
index 8fe4d0790e6c4092c399d31aa9c0246f3a3dd9e8..6ea568476ba14fc3bfc29a2a7d55198b651ef6e4 100644
(file)
--- a/
Cython/Compiler/PyrexTypes.py
+++ b/
Cython/Compiler/PyrexTypes.py
@@
-630,7
+630,7
@@
class CFuncType(CType):
if not self.is_overridable and other_type.is_overridable:
return 0
nargs = len(self.args)
if not self.is_overridable and other_type.is_overridable:
return 0
nargs = len(self.args)
- if nargs
<>
len(other_type.args):
+ if nargs
!=
len(other_type.args):
return 0
# When comparing C method signatures, the first argument
# is exempt from compatibility checking (the proper check
return 0
# When comparing C method signatures, the first argument
# is exempt from compatibility checking (the proper check
@@
-639,9
+639,9
@@
class CFuncType(CType):
if not self.args[i].type.same_as(
other_type.args[i].type):
return 0
if not self.args[i].type.same_as(
other_type.args[i].type):
return 0
- if self.has_varargs
<>
other_type.has_varargs:
+ if self.has_varargs
!=
other_type.has_varargs:
return 0
return 0
- if self.optional_arg_count
<>
other_type.optional_arg_count:
+ if self.optional_arg_count
!=
other_type.optional_arg_count:
return 0
if not self.return_type.same_as(other_type.return_type):
return 0
return 0
if not self.return_type.same_as(other_type.return_type):
return 0
@@
-695,7
+695,7
@@
class CFuncType(CType):
if not other_type.is_cfunction:
return 0
nargs = len(self.args)
if not other_type.is_cfunction:
return 0
nargs = len(self.args)
- if nargs
<>
len(other_type.args):
+ if nargs
!=
len(other_type.args):
return 0
for i in range(as_cmethod, nargs):
if not self.args[i].type.subtype_of_resolved_type(other_type.args[i].type):
return 0
for i in range(as_cmethod, nargs):
if not self.args[i].type.subtype_of_resolved_type(other_type.args[i].type):
@@
-703,9
+703,9
@@
class CFuncType(CType):
else:
self.args[i].needs_type_test = other_type.args[i].needs_type_test \
or not self.args[i].type.same_as(other_type.args[i].type)
else:
self.args[i].needs_type_test = other_type.args[i].needs_type_test \
or not self.args[i].type.same_as(other_type.args[i].type)
- if self.has_varargs
<>
other_type.has_varargs:
+ if self.has_varargs
!=
other_type.has_varargs:
return 0
return 0
- if self.optional_arg_count
<>
other_type.optional_arg_count:
+ if self.optional_arg_count
!=
other_type.optional_arg_count:
return 0
if not self.return_type.subtype_of_resolved_type(other_type.return_type):
return 0
return 0
if not self.return_type.subtype_of_resolved_type(other_type.return_type):
return 0
diff --git
a/Cython/Compiler/Scanning.py
b/Cython/Compiler/Scanning.py
index ea2970b5a32067c79effcb7b34abb81d2174d8a8..e48c8dcea590480bf5c5778ed99f473860579903 100644
(file)
--- a/
Cython/Compiler/Scanning.py
+++ b/
Cython/Compiler/Scanning.py
@@
-42,7
+42,7
@@
def hash_source_file(path):
f = open(path, "rU")
text = f.read()
except IOError, e:
f = open(path, "rU")
text = f.read()
except IOError, e:
- print
"Unable to hash scanner source file (%s)" % e
+ print
("Unable to hash scanner source file (%s)" % e)
return ""
finally:
f.close()
return ""
finally:
f.close()
@@
-69,12
+69,12
@@
def open_pickled_lexicon(expected_hash):
result = f
f = None
else:
result = f
f = None
else:
- print
"Lexicon hash mismatch:"
###
- print
" expected", expected_hash
###
- print
" got ", actual_hash
###
+ print
("Lexicon hash mismatch:")
###
+ print
(" expected " + expected_hash)
###
+ print
(" got " + actual_hash)
###
except IOError, e:
except IOError, e:
- print
"Warning: Unable to read pickled lexicon", lexicon_pickle
- print
e
+ print
("Warning: Unable to read pickled lexicon " + lexicon_pickle)
+ print
(e)
if f:
f.close()
return result
if f:
f.close()
return result
@@
-89,37
+89,37
@@
def try_to_unpickle_lexicon():
if f:
if notify_lexicon_unpickling:
t0 = time()
if f:
if notify_lexicon_unpickling:
t0 = time()
- print
"Unpickling lexicon..."
+ print
("Unpickling lexicon...")
lexicon = pickle.load(f)
f.close()
if notify_lexicon_unpickling:
t1 = time()
lexicon = pickle.load(f)
f.close()
if notify_lexicon_unpickling:
t1 = time()
- print
"Done (%.2f seconds)" % (t1 - t0
)
+ print
("Done (%.2f seconds)" % (t1 - t0)
)
def create_new_lexicon():
global lexicon
t0 = time()
def create_new_lexicon():
global lexicon
t0 = time()
- print
"Creating lexicon..."
+ print
("Creating lexicon...")
lexicon = make_lexicon()
t1 = time()
lexicon = make_lexicon()
t1 = time()
- print
"Done (%.2f seconds)" % (t1 - t0
)
+ print
("Done (%.2f seconds)" % (t1 - t0)
)
def pickle_lexicon():
f = None
try:
f = open(lexicon_pickle, "wb")
except IOError:
def pickle_lexicon():
f = None
try:
f = open(lexicon_pickle, "wb")
except IOError:
- print
"Warning: Unable to save pickled lexicon in", lexicon_pickle
+ print
("Warning: Unable to save pickled lexicon in " + lexicon_pickle)
if f:
if notify_lexicon_pickling:
t0 = time()
if f:
if notify_lexicon_pickling:
t0 = time()
- print
"Pickling lexicon..."
+ print
("Pickling lexicon...")
pickle.dump(lexicon_hash, f, binary_lexicon_pickle)
pickle.dump(lexicon, f, binary_lexicon_pickle)
f.close()
if notify_lexicon_pickling:
t1 = time()
pickle.dump(lexicon_hash, f, binary_lexicon_pickle)
pickle.dump(lexicon, f, binary_lexicon_pickle)
f.close()
if notify_lexicon_pickling:
t1 = time()
- print
"Done (%.2f seconds)" % (t1 - t0
)
+ print
("Done (%.2f seconds)" % (t1 - t0)
)
def get_lexicon():
global lexicon
def get_lexicon():
global lexicon
@@
-284,9
+284,9
@@
class PyrexScanner(Scanner):
self.indentation_char = c
#print "Scanner.indentation_action: setting indent_char to", repr(c)
else:
self.indentation_char = c
#print "Scanner.indentation_action: setting indent_char to", repr(c)
else:
- if self.indentation_char
<>
c:
+ if self.indentation_char
!=
c:
self.error("Mixed use of tabs and spaces")
self.error("Mixed use of tabs and spaces")
- if text.replace(c, "")
<>
"":
+ if text.replace(c, "")
!=
"":
self.error("Mixed use of tabs and spaces")
# Figure out how many indents/dedents to do
current_level = self.current_level()
self.error("Mixed use of tabs and spaces")
# Figure out how many indents/dedents to do
current_level = self.current_level()
@@
-304,7
+304,7
@@
class PyrexScanner(Scanner):
self.indentation_stack.pop()
self.produce('DEDENT', '')
#print "...current level now", self.current_level() ###
self.indentation_stack.pop()
self.produce('DEDENT', '')
#print "...current level now", self.current_level() ###
- if new_level
<>
self.current_level():
+ if new_level
!=
self.current_level():
self.error("Inconsistent indentation")
def eof_action(self, text):
self.error("Inconsistent indentation")
def eof_action(self, text):
@@
-328,7
+328,7
@@
class PyrexScanner(Scanner):
t = self.sy
else:
t = "%s %s" % (self.sy, self.systring)
t = self.sy
else:
t = "%s %s" % (self.sy, self.systring)
- print
"--- %3d %2d %s" % (line, col, t
)
+ print
("--- %3d %2d %s" % (line, col, t)
)
def put_back(self, sy, systring):
self.unread(self.sy, self.systring)
def put_back(self, sy, systring):
self.unread(self.sy, self.systring)
@@
-380,5
+380,5
@@
class PyrexScanner(Scanner):
def expect_newline(self, message = "Expected a newline"):
# Expect either a newline or end of file
def expect_newline(self, message = "Expected a newline"):
# Expect either a newline or end of file
- if self.sy
<>
'EOF':
+ if self.sy
!=
'EOF':
self.expect('NEWLINE', message)
self.expect('NEWLINE', message)
diff --git
a/Cython/Compiler/Symtab.py
b/Cython/Compiler/Symtab.py
index c96472da94c4eec9534aa2e2e750732a1ff94857..bd252c10b9db3dc7d2110f74b609200041b4024a 100644
(file)
--- a/
Cython/Compiler/Symtab.py
+++ b/
Cython/Compiler/Symtab.py
@@
-304,12
+304,12
@@
class Scope:
return entry
def check_previous_typedef_flag(self, entry, typedef_flag, pos):
return entry
def check_previous_typedef_flag(self, entry, typedef_flag, pos):
- if typedef_flag
<>
entry.type.typedef_flag:
+ if typedef_flag
!=
entry.type.typedef_flag:
error(pos, "'%s' previously declared using '%s'" % (
entry.name, ("cdef", "ctypedef")[entry.type.typedef_flag]))
def check_previous_visibility(self, entry, visibility, pos):
error(pos, "'%s' previously declared using '%s'" % (
entry.name, ("cdef", "ctypedef")[entry.type.typedef_flag]))
def check_previous_visibility(self, entry, visibility, pos):
- if entry.visibility
<>
visibility:
+ if entry.visibility
!=
visibility:
error(pos, "'%s' previously declared as '%s'" % (
entry.name, entry.visibility))
error(pos, "'%s' previously declared as '%s'" % (
entry.name, entry.visibility))
@@
-334,7
+334,7
@@
class Scope:
cname = None, visibility = 'private', is_cdef = 0):
# Add an entry for a variable.
if not cname:
cname = None, visibility = 'private', is_cdef = 0):
# Add an entry for a variable.
if not cname:
- if visibility
<>
'private':
+ if visibility
!=
'private':
cname = name
else:
cname = self.mangle(Naming.var_prefix, name)
cname = name
else:
cname = self.mangle(Naming.var_prefix, name)
@@
-361,24
+361,24
@@
class Scope:
# Add an entry for a C function.
entry = self.lookup_here(name)
if entry:
# Add an entry for a C function.
entry = self.lookup_here(name)
if entry:
- if visibility
<> 'private' and visibility <>
entry.visibility:
+ if visibility
!= 'private' and visibility !=
entry.visibility:
warning(pos, "Function '%s' previously declared as '%s'" % (name, entry.visibility), 1)
if not entry.type.same_as(type):
warning(pos, "Function signature does not match previous declaration", 1)
entry.type = type
else:
if not cname:
warning(pos, "Function '%s' previously declared as '%s'" % (name, entry.visibility), 1)
if not entry.type.same_as(type):
warning(pos, "Function signature does not match previous declaration", 1)
entry.type = type
else:
if not cname:
- if api or visibility
<>
'private':
+ if api or visibility
!=
'private':
cname = name
else:
cname = self.mangle(Naming.func_prefix, name)
entry = self.add_cfunction(name, type, pos, cname, visibility)
entry.func_cname = cname
cname = name
else:
cname = self.mangle(Naming.func_prefix, name)
entry = self.add_cfunction(name, type, pos, cname, visibility)
entry.func_cname = cname
- if in_pxd and visibility
<>
'extern':
+ if in_pxd and visibility
!=
'extern':
entry.defined_in_pxd = 1
if api:
entry.api = 1
entry.defined_in_pxd = 1
if api:
entry.api = 1
- if not defining and not in_pxd and visibility
<>
'extern':
+ if not defining and not in_pxd and visibility
!=
'extern':
error(pos, "Non-extern C function declared but not defined")
return entry
error(pos, "Non-extern C function declared but not defined")
return entry
@@
-849,7
+849,7
@@
class ModuleScope(Scope):
entry = None # Will cause an error when we redeclare it
else:
self.check_previous_typedef_flag(entry, typedef_flag, pos)
entry = None # Will cause an error when we redeclare it
else:
self.check_previous_typedef_flag(entry, typedef_flag, pos)
- if base_type
<>
type.base_type:
+ if base_type
!=
type.base_type:
error(pos, "Base type does not match previous declaration")
#
# Make a new entry if needed
error(pos, "Base type does not match previous declaration")
#
# Make a new entry if needed
@@
-898,17
+898,17
@@
class ModuleScope(Scope):
entry.defined_in_pxd = 1
if implementing: # So that filenames in runtime exceptions refer to
entry.pos = pos # the .pyx file and not the .pxd file
entry.defined_in_pxd = 1
if implementing: # So that filenames in runtime exceptions refer to
entry.pos = pos # the .pyx file and not the .pxd file
- if visibility
<> 'private' and entry.visibility <>
visibility:
+ if visibility
!= 'private' and entry.visibility !=
visibility:
error(pos, "Class '%s' previously declared as '%s'"
% (name, entry.visibility))
if api:
entry.api = 1
if objstruct_cname:
error(pos, "Class '%s' previously declared as '%s'"
% (name, entry.visibility))
if api:
entry.api = 1
if objstruct_cname:
- if type.objstruct_cname and type.objstruct_cname
<>
objstruct_cname:
+ if type.objstruct_cname and type.objstruct_cname
!=
objstruct_cname:
error(pos, "Object struct name differs from previous declaration")
type.objstruct_cname = objstruct_cname
if typeobj_cname:
error(pos, "Object struct name differs from previous declaration")
type.objstruct_cname = objstruct_cname
if typeobj_cname:
- if type.typeobj_cname and type.typeobj_cname
<>
typeobj_cname:
+ if type.typeobj_cname and type.typeobj_cname
!=
typeobj_cname:
error(pos, "Type object name differs from previous declaration")
type.typeobj_cname = typeobj_cname
#
error(pos, "Type object name differs from previous declaration")
type.typeobj_cname = typeobj_cname
#
@@
-952,12
+952,12
@@
class ModuleScope(Scope):
#
debug_check_c_classes = 0
if debug_check_c_classes:
#
debug_check_c_classes = 0
if debug_check_c_classes:
- print
"Scope.check_c_classes: checking scope", self.qualified_name
+ print
("Scope.check_c_classes: checking scope " + self.qualified_name)
for entry in self.c_class_entries:
if debug_check_c_classes:
for entry in self.c_class_entries:
if debug_check_c_classes:
- print
"...entry", entry.name, entry
- print
"......type =", entry.type
- print
"......visibility =", entry.visibility
+ print
("...entry %s %s" % (entry.name, entry))
+ print
("......type = " + entry.type)
+ print
("......visibility = " + entry.visibility)
type = entry.type
name = entry.name
visibility = entry.visibility
type = entry.type
name = entry.name
visibility = entry.visibility
@@
-965,7
+965,7
@@
class ModuleScope(Scope):
if not type.scope:
error(entry.pos, "C class '%s' is declared but not defined" % name)
# Generate typeobj_cname
if not type.scope:
error(entry.pos, "C class '%s' is declared but not defined" % name)
# Generate typeobj_cname
- if visibility
<>
'extern' and not type.typeobj_cname:
+ if visibility
!=
'extern' and not type.typeobj_cname:
type.typeobj_cname = self.mangle(Naming.typeobj_prefix, name)
## Generate typeptr_cname
#type.typeptr_cname = self.mangle(Naming.typeptr_prefix, name)
type.typeobj_cname = self.mangle(Naming.typeobj_prefix, name)
## Generate typeptr_cname
#type.typeptr_cname = self.mangle(Naming.typeptr_prefix, name)
@@
-1054,7
+1054,7
@@
class StructOrUnionScope(Scope):
if type.is_pyobject and not allow_pyobject:
error(pos,
"C struct/union member cannot be a Python object")
if type.is_pyobject and not allow_pyobject:
error(pos,
"C struct/union member cannot be a Python object")
- if visibility
<>
'private':
+ if visibility
!=
'private':
error(pos,
"C struct/union member cannot be declared %s" % visibility)
return entry
error(pos,
"C struct/union member cannot be declared %s" % visibility)
return entry
@@
-1148,7
+1148,7
@@
class CClassScope(ClassScope):
def __init__(self, name, outer_scope, visibility):
ClassScope.__init__(self, name, outer_scope)
def __init__(self, name, outer_scope, visibility):
ClassScope.__init__(self, name, outer_scope)
- if visibility
<>
'extern':
+ if visibility
!=
'extern':
self.method_table_cname = outer_scope.mangle(Naming.methtab_prefix, name)
self.member_table_cname = outer_scope.mangle(Naming.memtab_prefix, name)
self.getset_table_cname = outer_scope.mangle(Naming.gstab_prefix, name)
self.method_table_cname = outer_scope.mangle(Naming.methtab_prefix, name)
self.member_table_cname = outer_scope.mangle(Naming.memtab_prefix, name)
self.getset_table_cname = outer_scope.mangle(Naming.gstab_prefix, name)
diff --git
a/Cython/Compiler/TypeSlots.py
b/Cython/Compiler/TypeSlots.py
index f66dc1e7cc43b56a539a004cad0da1d7947f3e9b..29179b75b30e4eee5d5af87523b5f9e420487967 100644
(file)
--- a/
Cython/Compiler/TypeSlots.py
+++ b/
Cython/Compiler/TypeSlots.py
@@
-147,7
+147,7
@@
class SlotDescriptor:
def generate_dynamic_init_code(self, scope, code):
if self.is_initialised_dynamically:
value = self.slot_code(scope)
def generate_dynamic_init_code(self, scope, code):
if self.is_initialised_dynamically:
value = self.slot_code(scope)
- if value
<>
"0":
+ if value
!=
"0":
code.putln("%s.%s = %s;" % (
scope.parent_type.typeobj_cname,
self.slot_name,
code.putln("%s.%s = %s;" % (
scope.parent_type.typeobj_cname,
self.slot_name,
diff --git
a/Cython/Debugging.py
b/Cython/Debugging.py
index 1fbccd885fb6def74b8b7e16e07a8f57fb650f64..edb3f4e8ca582e4f0bc938c761b1fdf1f9d56f6b 100644
(file)
--- a/
Cython/Debugging.py
+++ b/
Cython/Debugging.py
@@
-6,7
+6,7
@@
def print_call_chain(*args):
import sys
def print_call_chain(*args):
import sys
- print
" ".join(map(str, args
))
+ print
(" ".join(map(str, args)
))
f = sys._getframe(1)
while f:
name = f.f_code.co_name
f = sys._getframe(1)
while f:
name = f.f_code.co_name
@@
-15,6
+15,6
@@
def print_call_chain(*args):
c = getattr(s, "__class__", None)
if c:
name = "%s.%s" % (c.__name__, name)
c = getattr(s, "__class__", None)
if c:
name = "%s.%s" % (c.__name__, name)
- print
"Called from:", name, f.f_lineno
+ print
("Called from: %s %s" % (name, f.f_lineno))
f = f.f_back
f = f.f_back
- print
"-" * 70
+ print
("-" * 70)
diff --git
a/Cython/Mac/DarwinSystem.py
b/Cython/Mac/DarwinSystem.py
index 7b82467a996f298187678a8eb23a9f932700d577..1edeab39479b94b4906613478fc10d74b095a8b8 100644
(file)
--- a/
Cython/Mac/DarwinSystem.py
+++ b/
Cython/Mac/DarwinSystem.py
@@
-69,10
+69,10
@@
def c_compile(c_file, verbose_flag = 0, cplus = 0, obj_suffix = ".o"):
compiler = compilers[bool(cplus)]
args = [compiler] + compiler_options + include_options + [c_file, "-o", o_file]
if verbose_flag or verbose:
compiler = compilers[bool(cplus)]
args = [compiler] + compiler_options + include_options + [c_file, "-o", o_file]
if verbose_flag or verbose:
- print
" ".join(args
)
+ print
(" ".join(args)
)
#print compiler, args ###
status = os.spawnvp(os.P_WAIT, compiler, args)
#print compiler, args ###
status = os.spawnvp(os.P_WAIT, compiler, args)
- if status
<>
0:
+ if status
!=
0:
raise CCompilerError("C compiler returned status %s" % status)
return o_file
raise CCompilerError("C compiler returned status %s" % status)
return o_file
@@
-87,8
+87,8
@@
def c_link_list(obj_files, verbose_flag = 0, cplus = 0):
linker = linkers[bool(cplus)]
args = [linker] + linker_options + obj_files + ["-o", out_file]
if verbose_flag or verbose:
linker = linkers[bool(cplus)]
args = [linker] + linker_options + obj_files + ["-o", out_file]
if verbose_flag or verbose:
- print
" ".join(args
)
+ print
(" ".join(args)
)
status = os.spawnvp(os.P_WAIT, linker, args)
status = os.spawnvp(os.P_WAIT, linker, args)
- if status
<>
0:
+ if status
!=
0:
raise CCompilerError("Linker returned status %s" % status)
return out_file
raise CCompilerError("Linker returned status %s" % status)
return out_file
diff --git
a/Cython/Mac/MacSystem.py
b/Cython/Mac/MacSystem.py
index 9af34d85a4535c24fad75137725d1a9df6523144..1f02b970c5a4cb82894cf868f46370c940a0fa8a 100644
(file)
--- a/
Cython/Mac/MacSystem.py
+++ b/
Cython/Mac/MacSystem.py
@@
-124,8
+124,8
@@
def test_c_compile(link = 0):
except PyrexError, e:
#print "Caught a PyrexError:" ###
#print repr(e) ###
except PyrexError, e:
#print "Caught a PyrexError:" ###
#print repr(e) ###
- print
"%s.%s:
" % (e.__class__.__module__,
- e.__class__.__name__
), e
+ print
("%s.%s: %s
" % (e.__class__.__module__,
+ e.__class__.__name__
, e))
sys.exit(1)
else:
obj = arg
sys.exit(1)
else:
obj = arg
diff --git
a/Cython/Plex/Lexicons.py
b/Cython/Plex/Lexicons.py
index 32b12c431c3063d248762211fa83e4ceaeec04da..2dbfaf0637b5a4dd4aff0339d36ff68f1f736282 100644
(file)
--- a/
Cython/Plex/Lexicons.py
+++ b/
Cython/Plex/Lexicons.py
@@
-111,7
+111,7
@@
class Lexicon:
tables = None # StateTableMachine
def __init__(self, specifications, debug = None, debug_flags = 7, timings = None):
tables = None # StateTableMachine
def __init__(self, specifications, debug = None, debug_flags = 7, timings = None):
- if type(specifications)
<>
types.ListType:
+ if type(specifications)
!=
types.ListType:
raise Errors.InvalidScanner("Scanner definition is not a list")
if timings:
from Timing import time
raise Errors.InvalidScanner("Scanner definition is not a list")
if timings:
from Timing import time
@@
-176,9
+176,9
@@
class Lexicon:
raise e.__class__("Token number %d: %s" % (token_number, e))
def parse_token_definition(self, token_spec):
raise e.__class__("Token number %d: %s" % (token_number, e))
def parse_token_definition(self, token_spec):
- if type(token_spec)
<>
types.TupleType:
+ if type(token_spec)
!=
types.TupleType:
raise Errors.InvalidToken("Token definition is not a tuple")
raise Errors.InvalidToken("Token definition is not a tuple")
- if len(token_spec)
<>
2:
+ if len(token_spec)
!=
2:
raise Errors.InvalidToken("Wrong number of items in token definition")
pattern, action = token_spec
if not isinstance(pattern, Regexps.RE):
raise Errors.InvalidToken("Wrong number of items in token definition")
pattern, action = token_spec
if not isinstance(pattern, Regexps.RE):
diff --git
a/Cython/Plex/Machines.py
b/Cython/Plex/Machines.py
index fb9ba717d80f5bc40a76b84b4027fe64c73c684d..6adfa34046b524e920f76f9f62f9e6cf616340b6 100644
(file)
--- a/
Cython/Plex/Machines.py
+++ b/
Cython/Plex/Machines.py
@@
-182,7
+182,7
@@
class FastMachine:
code0, code1 = event
if code0 == -maxint:
state['else'] = new_state
code0, code1 = event
if code0 == -maxint:
state['else'] = new_state
- elif code1
<>
maxint:
+ elif code1
!=
maxint:
while code0 < code1:
state[chr(code0)] = new_state
code0 = code0 + 1
while code0 < code1:
state[chr(code0)] = new_state
code0 = code0 + 1
diff --git
a/Cython/Plex/Regexps.py
b/Cython/Plex/Regexps.py
index 6164d3bdfb2922a00ed21a0ee4b5feeb7b342522..d820f8c17c3da30dfded3bd50b141516d81900e6 100644
(file)
--- a/
Cython/Plex/Regexps.py
+++ b/
Cython/Plex/Regexps.py
@@
-152,12
+152,12
@@
class RE:
self.wrong_type(num, value, "Plex.RE instance")
def check_string(self, num, value):
self.wrong_type(num, value, "Plex.RE instance")
def check_string(self, num, value):
- if type(value)
<>
type(''):
+ if type(value)
!=
type(''):
self.wrong_type(num, value, "string")
def check_char(self, num, value):
self.check_string(num, value)
self.wrong_type(num, value, "string")
def check_char(self, num, value):
self.check_string(num, value)
- if len(value)
<>
1:
+ if len(value)
!=
1:
raise Errors.PlexValueError("Invalid value for argument %d of Plex.%s."
"Expected a string of length 1, got: %s" % (
num, self.__class__.__name__, repr(value)))
raise Errors.PlexValueError("Invalid value for argument %d of Plex.%s."
"Expected a string of length 1, got: %s" % (
num, self.__class__.__name__, repr(value)))
@@
-192,7
+192,7
@@
class RE:
## def build_machine(self, m, initial_state, final_state, match_bol, nocase):
## c = self.char
## def build_machine(self, m, initial_state, final_state, match_bol, nocase):
## c = self.char
-## if match_bol and c
<>
BOL:
+## if match_bol and c
!=
BOL:
## s1 = self.build_opt(m, initial_state, BOL)
## else:
## s1 = initial_state
## s1 = self.build_opt(m, initial_state, BOL)
## else:
## s1 = initial_state
diff --git
a/Cython/Plex/Scanners.py
b/Cython/Plex/Scanners.py
index 6278d88ba4d5d360125fa489a7b4fa552d4d7ad1..acf4b83bc13973d698c0176cf91f8af3a630060e 100644
(file)
--- a/
Cython/Plex/Scanners.py
+++ b/
Cython/Plex/Scanners.py
@@
-122,8
+122,8
@@
class Scanner:
action = self.run_machine_inlined()
if action:
if self.trace:
action = self.run_machine_inlined()
if action:
if self.trace:
- print
"Scanner: read: Performing", action, "
%d:%d" % (
-
self.start_pos, self.cur_pos
)
+ print
("Scanner: read: Performing %s
%d:%d" % (
+
action, self.start_pos, self.cur_pos)
)
base = self.buf_start_pos
text = self.buffer[self.start_pos - base : self.cur_pos - base]
return (text, action)
base = self.buf_start_pos
text = self.buffer[self.start_pos - base : self.cur_pos - base]
return (text, action)
@@
-163,8
+163,8
@@
class Scanner:
trace = self.trace
while 1:
if trace: #TRACE#
trace = self.trace
while 1:
if trace: #TRACE#
- print
"State %d, %d/%d:%s -->" % ( #TRACE#
- state['number'], input_state, cur_pos, repr(cur_char))
,
#TRACE#
+ print
(
"State %d, %d/%d:%s -->" % ( #TRACE#
+ state['number'], input_state, cur_pos, repr(cur_char))
)
#TRACE#
# Begin inlined self.save_for_backup()
#action = state.action #@slow
action = state['action'] #@fast
# Begin inlined self.save_for_backup()
#action = state.action #@slow
action = state['action'] #@fast
@@
-179,7
+179,7
@@
class Scanner:
new_state = c and state.get('else') #@fast
if new_state:
if trace: #TRACE#
new_state = c and state.get('else') #@fast
if new_state:
if trace: #TRACE#
- print
"State %d" % new_state['number']
#TRACE#
+ print
("State %d" % new_state['number'])
#TRACE#
state = new_state
# Begin inlined: self.next_char()
if input_state == 1:
state = new_state
# Begin inlined: self.next_char()
if input_state == 1:
@@
-228,7
+228,7
@@
class Scanner:
# End inlined self.next_char()
else: # not new_state
if trace: #TRACE#
# End inlined self.next_char()
else: # not new_state
if trace: #TRACE#
- print
"blocked"
#TRACE#
+ print
("blocked")
#TRACE#
# Begin inlined: action = self.back_up()
if backup_state:
(action, cur_pos, cur_line, cur_line_start,
# Begin inlined: action = self.back_up()
if backup_state:
(action, cur_pos, cur_line, cur_line_start,
@@
-245,7
+245,7
@@
class Scanner:
self.next_pos = next_pos
if trace: #TRACE#
if action: #TRACE#
self.next_pos = next_pos
if trace: #TRACE#
if action: #TRACE#
- print
"Doing", action
#TRACE#
+ print
("Doing " + action)
#TRACE#
return action
# def transition(self):
return action
# def transition(self):
@@
-288,7
+288,7
@@
class Scanner:
def next_char(self):
input_state = self.input_state
if self.trace:
def next_char(self):
input_state = self.input_state
if self.trace:
- print
"Scanner: next:", " "*20, "[%d] %d" % (input_state, self.cur_pos),
+ print
("Scanner: next: %s [%d] %d" % (" "*20, input_state, self.cur_pos))
if input_state == 1:
self.cur_pos = self.next_pos
c = self.read_char()
if input_state == 1:
self.cur_pos = self.next_pos
c = self.read_char()
@@
-314,7
+314,7
@@
class Scanner:
else: # input_state = 5
self.cur_char = ''
if self.trace:
else: # input_state = 5
self.cur_char = ''
if self.trace:
- print
"--> [%d] %d %s" % (input_state, self.cur_pos, repr(self.cur_char
))
+ print
("--> [%d] %d %s" % (input_state, self.cur_pos, repr(self.cur_char)
))
# def read_char(self):
# """
# def read_char(self):
# """
diff --git
a/Cython/Plex/Traditional.py
b/Cython/Plex/Traditional.py
index b3148c1ec0e619c2bb2d87379b9c1b0317a06159..4ba4bbbdb410975dc3236b96907e7118978eff39 100644
(file)
--- a/
Cython/Plex/Traditional.py
+++ b/
Cython/Plex/Traditional.py
@@
-95,9
+95,9
@@
class REParser:
if self.c == ']':
char_list.append(']')
self.next()
if self.c == ']':
char_list.append(']')
self.next()
- while not self.end and self.c
<>
']':
+ while not self.end and self.c
!=
']':
c1 = self.get()
c1 = self.get()
- if self.c == '-' and self.lookahead(1)
<>
']':
+ if self.c == '-' and self.lookahead(1)
!=
']':
self.next()
c2 = self.get()
for a in xrange(ord(c1), ord(c2) + 1):
self.next()
c2 = self.get()
for a in xrange(ord(c1), ord(c2) + 1):
diff --git
a/Cython/Plex/Transitions.py
b/Cython/Plex/Transitions.py
index c1edd5efc18c311a733e3e42862cb0bf0683b4de..c34dce882b7b9d38fce38ec4cd77a1949accb14d 100644
(file)
--- a/
Cython/Plex/Transitions.py
+++ b/
Cython/Plex/Transitions.py
@@
-190,7
+190,7
@@
class TransitionMap:
def check(self):
"""Check data structure integrity."""
if not self.map[-3] < self.map[-1]:
def check(self):
"""Check data structure integrity."""
if not self.map[-3] < self.map[-1]:
- print
self
+ print
(self)
assert 0
def dump(self, file):
assert 0
def dump(self, file):
diff --git
a/Cython/Unix/LinuxSystem.py
b/Cython/Unix/LinuxSystem.py
index 1f71e3fd3edb16cb9b9493e9d5d604e5b12188fe..7bdfd6e66a1735ae04ef2c6f56d7b9acc981e3e0 100644
(file)
--- a/
Cython/Unix/LinuxSystem.py
+++ b/
Cython/Unix/LinuxSystem.py
@@
-49,10
+49,10
@@
def c_compile(c_file, verbose_flag = 0, cplus = 0, obj_suffix = ".o"):
compiler = compilers[bool(cplus)]
args = [compiler] + compiler_options + include_options + [c_file, "-o", o_file]
if verbose_flag or verbose:
compiler = compilers[bool(cplus)]
args = [compiler] + compiler_options + include_options + [c_file, "-o", o_file]
if verbose_flag or verbose:
- print
" ".join(args
)
+ print
(" ".join(args)
)
#print compiler, args ###
status = os.spawnvp(os.P_WAIT, compiler, args)
#print compiler, args ###
status = os.spawnvp(os.P_WAIT, compiler, args)
- if status
<>
0:
+ if status
!=
0:
raise CCompilerError("C compiler returned status %s" % status)
return o_file
raise CCompilerError("C compiler returned status %s" % status)
return o_file
@@
-67,8
+67,8
@@
def c_link_list(obj_files, verbose_flag = 0, cplus = 0):
linker = linkers[bool(cplus)]
args = [linker] + linker_options + obj_files + ["-o", out_file]
if verbose_flag or verbose:
linker = linkers[bool(cplus)]
args = [linker] + linker_options + obj_files + ["-o", out_file]
if verbose_flag or verbose:
- print
" ".join(args
)
+ print
(" ".join(args)
)
status = os.spawnvp(os.P_WAIT, linker, args)
status = os.spawnvp(os.P_WAIT, linker, args)
- if status
<>
0:
+ if status
!=
0:
raise CCompilerError("Linker returned status %s" % status)
return out_file
raise CCompilerError("Linker returned status %s" % status)
return out_file