2005-10-20 19:59:25 +00:00
|
|
|
#! /usr/bin/env python
|
|
|
|
"""Generate C code from an ASDL description."""
|
|
|
|
|
|
|
|
# TO DO
|
|
|
|
# handle fields that have a type but no name
|
|
|
|
|
2008-02-23 18:30:17 +00:00
|
|
|
import os, sys
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
import asdl
|
|
|
|
|
|
|
|
TABSIZE = 8
|
|
|
|
MAX_COL = 80
|
|
|
|
|
|
|
|
def get_c_type(name):
|
|
|
|
"""Return a string for the C name of the type.
|
|
|
|
|
|
|
|
This function special cases the default types provided by asdl:
|
2007-02-26 19:04:49 +00:00
|
|
|
identifier, string, int.
|
2005-10-20 19:59:25 +00:00
|
|
|
"""
|
|
|
|
# XXX ack! need to figure out where Id is useful and where string
|
|
|
|
if isinstance(name, asdl.Id):
|
|
|
|
name = name.value
|
|
|
|
if name in asdl.builtin_types:
|
|
|
|
return name
|
|
|
|
else:
|
|
|
|
return "%s_ty" % name
|
|
|
|
|
|
|
|
def reflow_lines(s, depth):
|
|
|
|
"""Reflow the line s indented depth tabs.
|
|
|
|
|
|
|
|
Return a sequence of lines where no line extends beyond MAX_COL
|
|
|
|
when properly indented. The first line is properly indented based
|
|
|
|
exclusively on depth * TABSIZE. All following lines -- these are
|
|
|
|
the reflowed lines generated by this function -- start at the same
|
|
|
|
column as the first character beyond the opening { in the first
|
|
|
|
line.
|
|
|
|
"""
|
|
|
|
size = MAX_COL - depth * TABSIZE
|
|
|
|
if len(s) < size:
|
|
|
|
return [s]
|
|
|
|
|
|
|
|
lines = []
|
|
|
|
cur = s
|
|
|
|
padding = ""
|
|
|
|
while len(cur) > size:
|
|
|
|
i = cur.rfind(' ', 0, size)
|
|
|
|
# XXX this should be fixed for real
|
|
|
|
if i == -1 and 'GeneratorExp' in cur:
|
|
|
|
i = size + 3
|
2006-08-25 04:06:31 +00:00
|
|
|
assert i != -1, "Impossible line %d to reflow: %r" % (size, s)
|
2005-10-20 19:59:25 +00:00
|
|
|
lines.append(padding + cur[:i])
|
|
|
|
if len(lines) == 1:
|
|
|
|
# find new size based on brace
|
|
|
|
j = cur.find('{', 0, i)
|
|
|
|
if j >= 0:
|
|
|
|
j += 2 # account for the brace and the space after it
|
|
|
|
size -= j
|
|
|
|
padding = " " * j
|
|
|
|
else:
|
|
|
|
j = cur.find('(', 0, i)
|
|
|
|
if j >= 0:
|
|
|
|
j += 1 # account for the paren (no space after it)
|
|
|
|
size -= j
|
|
|
|
padding = " " * j
|
|
|
|
cur = cur[i+1:]
|
|
|
|
else:
|
|
|
|
lines.append(padding + cur)
|
|
|
|
return lines
|
|
|
|
|
|
|
|
def is_simple(sum):
|
|
|
|
"""Return True if a sum is a simple.
|
|
|
|
|
|
|
|
A sum is simple if its types have no fields, e.g.
|
|
|
|
unaryop = Invert | Not | UAdd | USub
|
|
|
|
"""
|
|
|
|
for t in sum.types:
|
|
|
|
if t.fields:
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class EmitVisitor(asdl.VisitorBase):
|
|
|
|
"""Visit that emits lines"""
|
|
|
|
|
|
|
|
def __init__(self, file):
|
|
|
|
self.file = file
|
|
|
|
super(EmitVisitor, self).__init__()
|
|
|
|
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
def emit(self, s, depth, reflow=True):
|
2005-10-20 19:59:25 +00:00
|
|
|
# XXX reflow long lines?
|
|
|
|
if reflow:
|
|
|
|
lines = reflow_lines(s, depth)
|
|
|
|
else:
|
|
|
|
lines = [s]
|
|
|
|
for line in lines:
|
|
|
|
line = (" " * TABSIZE * depth) + line + "\n"
|
|
|
|
self.file.write(line)
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class TypeDefVisitor(EmitVisitor):
|
|
|
|
def visitModule(self, mod):
|
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
|
|
|
|
|
|
|
def visitType(self, type, depth=0):
|
|
|
|
self.visit(type.value, type.name, depth)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name, depth):
|
|
|
|
if is_simple(sum):
|
|
|
|
self.simple_sum(sum, name, depth)
|
|
|
|
else:
|
|
|
|
self.sum_with_constructors(sum, name, depth)
|
|
|
|
|
|
|
|
def simple_sum(self, sum, name, depth):
|
|
|
|
enum = []
|
|
|
|
for i in range(len(sum.types)):
|
|
|
|
type = sum.types[i]
|
|
|
|
enum.append("%s=%d" % (type.name, i + 1))
|
|
|
|
enums = ", ".join(enum)
|
|
|
|
ctype = get_c_type(name)
|
|
|
|
s = "typedef enum _%s { %s } %s;" % (name, enums, ctype)
|
|
|
|
self.emit(s, depth)
|
|
|
|
self.emit("", depth)
|
|
|
|
|
|
|
|
def sum_with_constructors(self, sum, name, depth):
|
|
|
|
ctype = get_c_type(name)
|
|
|
|
s = "typedef struct _%(name)s *%(ctype)s;" % locals()
|
|
|
|
self.emit(s, depth)
|
|
|
|
self.emit("", depth)
|
|
|
|
|
|
|
|
def visitProduct(self, product, name, depth):
|
|
|
|
ctype = get_c_type(name)
|
|
|
|
s = "typedef struct _%(name)s *%(ctype)s;" % locals()
|
|
|
|
self.emit(s, depth)
|
|
|
|
self.emit("", depth)
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class StructVisitor(EmitVisitor):
|
|
|
|
"""Visitor to generate typdefs for AST."""
|
|
|
|
|
|
|
|
def visitModule(self, mod):
|
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
|
|
|
|
|
|
|
def visitType(self, type, depth=0):
|
|
|
|
self.visit(type.value, type.name, depth)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name, depth):
|
|
|
|
if not is_simple(sum):
|
|
|
|
self.sum_with_constructors(sum, name, depth)
|
|
|
|
|
|
|
|
def sum_with_constructors(self, sum, name, depth):
|
|
|
|
def emit(s, depth=depth):
|
|
|
|
self.emit(s % sys._getframe(1).f_locals, depth)
|
|
|
|
enum = []
|
|
|
|
for i in range(len(sum.types)):
|
|
|
|
type = sum.types[i]
|
|
|
|
enum.append("%s_kind=%d" % (type.name, i + 1))
|
|
|
|
|
2006-04-21 10:40:58 +00:00
|
|
|
emit("enum _%(name)s_kind {" + ", ".join(enum) + "};")
|
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
emit("struct _%(name)s {")
|
2006-04-21 10:40:58 +00:00
|
|
|
emit("enum _%(name)s_kind kind;", depth + 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
emit("union {", depth + 1)
|
|
|
|
for t in sum.types:
|
|
|
|
self.visit(t, depth + 2)
|
|
|
|
emit("} v;", depth + 1)
|
|
|
|
for field in sum.attributes:
|
|
|
|
# rudimentary attribute handling
|
|
|
|
type = str(field.type)
|
|
|
|
assert type in asdl.builtin_types, type
|
|
|
|
emit("%s %s;" % (type, field.name), depth + 1);
|
|
|
|
emit("};")
|
|
|
|
emit("")
|
|
|
|
|
|
|
|
def visitConstructor(self, cons, depth):
|
|
|
|
if cons.fields:
|
|
|
|
self.emit("struct {", depth)
|
|
|
|
for f in cons.fields:
|
|
|
|
self.visit(f, depth + 1)
|
|
|
|
self.emit("} %s;" % cons.name, depth)
|
|
|
|
self.emit("", depth)
|
|
|
|
else:
|
|
|
|
# XXX not sure what I want here, nothing is probably fine
|
|
|
|
pass
|
|
|
|
|
|
|
|
def visitField(self, field, depth):
|
|
|
|
# XXX need to lookup field.type, because it might be something
|
|
|
|
# like a builtin...
|
|
|
|
ctype = get_c_type(field.type)
|
|
|
|
name = field.name
|
|
|
|
if field.seq:
|
2006-04-21 10:40:58 +00:00
|
|
|
if field.type.value in ('cmpop',):
|
|
|
|
self.emit("asdl_int_seq *%(name)s;" % locals(), depth)
|
|
|
|
else:
|
|
|
|
self.emit("asdl_seq *%(name)s;" % locals(), depth)
|
2005-10-20 19:59:25 +00:00
|
|
|
else:
|
|
|
|
self.emit("%(ctype)s %(name)s;" % locals(), depth)
|
|
|
|
|
|
|
|
def visitProduct(self, product, name, depth):
|
|
|
|
self.emit("struct _%(name)s {" % locals(), depth)
|
|
|
|
for f in product.fields:
|
|
|
|
self.visit(f, depth + 1)
|
|
|
|
self.emit("};", depth)
|
|
|
|
self.emit("", depth)
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class PrototypeVisitor(EmitVisitor):
|
|
|
|
"""Generate function prototypes for the .h file"""
|
|
|
|
|
|
|
|
def visitModule(self, mod):
|
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
|
|
|
|
|
|
|
def visitType(self, type):
|
|
|
|
self.visit(type.value, type.name)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name):
|
|
|
|
if is_simple(sum):
|
|
|
|
pass # XXX
|
|
|
|
else:
|
|
|
|
for t in sum.types:
|
|
|
|
self.visit(t, name, sum.attributes)
|
|
|
|
|
|
|
|
def get_args(self, fields):
|
|
|
|
"""Return list of C argument into, one for each field.
|
|
|
|
|
|
|
|
Argument info is 3-tuple of a C type, variable name, and flag
|
|
|
|
that is true if type can be NULL.
|
|
|
|
"""
|
|
|
|
args = []
|
|
|
|
unnamed = {}
|
|
|
|
for f in fields:
|
|
|
|
if f.name is None:
|
|
|
|
name = f.type
|
|
|
|
c = unnamed[name] = unnamed.get(name, 0) + 1
|
|
|
|
if c > 1:
|
|
|
|
name = "name%d" % (c - 1)
|
|
|
|
else:
|
|
|
|
name = f.name
|
|
|
|
# XXX should extend get_c_type() to handle this
|
|
|
|
if f.seq:
|
2006-04-21 10:40:58 +00:00
|
|
|
if f.type.value in ('cmpop',):
|
|
|
|
ctype = "asdl_int_seq *"
|
|
|
|
else:
|
|
|
|
ctype = "asdl_seq *"
|
2005-10-20 19:59:25 +00:00
|
|
|
else:
|
|
|
|
ctype = get_c_type(f.type)
|
|
|
|
args.append((ctype, name, f.opt or f.seq))
|
|
|
|
return args
|
|
|
|
|
|
|
|
def visitConstructor(self, cons, type, attrs):
|
|
|
|
args = self.get_args(cons.fields)
|
|
|
|
attrs = self.get_args(attrs)
|
|
|
|
ctype = get_c_type(type)
|
|
|
|
self.emit_function(cons.name, ctype, args, attrs)
|
|
|
|
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
def emit_function(self, name, ctype, args, attrs, union=True):
|
2005-10-20 19:59:25 +00:00
|
|
|
args = args + attrs
|
|
|
|
if args:
|
|
|
|
argstr = ", ".join(["%s %s" % (atype, aname)
|
|
|
|
for atype, aname, opt in args])
|
2005-12-17 20:54:49 +00:00
|
|
|
argstr += ", PyArena *arena"
|
2005-10-20 19:59:25 +00:00
|
|
|
else:
|
2005-12-17 20:54:49 +00:00
|
|
|
argstr = "PyArena *arena"
|
Merged revisions 53451-53537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53454 | brett.cannon | 2007-01-15 20:12:08 +0100 (Mon, 15 Jan 2007) | 3 lines
Add a note for strptime that just because strftime supports some extra
directive that is not documented that strptime will as well.
........
r53458 | vinay.sajip | 2007-01-16 10:50:07 +0100 (Tue, 16 Jan 2007) | 1 line
Updated rotating file handlers to use _open().
........
r53459 | marc-andre.lemburg | 2007-01-16 14:03:06 +0100 (Tue, 16 Jan 2007) | 2 lines
Add news items for the recent pybench and platform changes.
........
r53460 | sjoerd.mullender | 2007-01-16 17:42:38 +0100 (Tue, 16 Jan 2007) | 4 lines
Fixed ntpath.expandvars to not replace references to non-existing
variables with nothing. Also added tests.
This fixes bug #494589.
........
r53464 | neal.norwitz | 2007-01-17 07:23:51 +0100 (Wed, 17 Jan 2007) | 1 line
Give Calvin Spealman access for python-dev summaries.
........
r53465 | neal.norwitz | 2007-01-17 09:37:26 +0100 (Wed, 17 Jan 2007) | 1 line
Remove Calvin since he only has access to the website currently.
........
r53466 | thomas.heller | 2007-01-17 10:40:34 +0100 (Wed, 17 Jan 2007) | 2 lines
Replace C++ comments with C comments.
........
r53472 | andrew.kuchling | 2007-01-17 20:55:06 +0100 (Wed, 17 Jan 2007) | 1 line
[Part of bug #1599254] Add suggestion to Mailbox docs to use Maildir, and warn user to lock/unlock mailboxes when modifying them
........
r53475 | georg.brandl | 2007-01-17 22:09:04 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1637967: missing //= operator in list.
........
r53477 | georg.brandl | 2007-01-17 22:19:58 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1629125: fix wrong data type (int -> Py_ssize_t) in PyDict_Next docs.
........
r53481 | neal.norwitz | 2007-01-18 06:40:58 +0100 (Thu, 18 Jan 2007) | 1 line
Try reverting part of r53145 that seems to cause the Windows buildbots to fail in test_uu.UUFileTest.test_encode
........
r53482 | fred.drake | 2007-01-18 06:42:30 +0100 (Thu, 18 Jan 2007) | 1 line
add missing version entry
........
r53483 | neal.norwitz | 2007-01-18 07:20:55 +0100 (Thu, 18 Jan 2007) | 7 lines
This test doesn't pass on Windows. The cause seems to be that chmod
doesn't support the same funcationality as on Unix. I'm not sure if
this fix is the best (or if it will even work)--it's a test to see
if the buildbots start passing again.
It might be better to not even run this test if it's windows (or non-posix).
........
r53488 | neal.norwitz | 2007-01-19 06:53:33 +0100 (Fri, 19 Jan 2007) | 1 line
SF #1635217, Fix unbalanced paren
........
r53489 | martin.v.loewis | 2007-01-19 07:42:22 +0100 (Fri, 19 Jan 2007) | 3 lines
Prefix AST symbols with _Py_. Fixes #1637022.
Will backport.
........
r53497 | martin.v.loewis | 2007-01-19 19:01:38 +0100 (Fri, 19 Jan 2007) | 2 lines
Add UUIDs for 2.5.1 and 2.5.2
........
r53499 | raymond.hettinger | 2007-01-19 19:07:18 +0100 (Fri, 19 Jan 2007) | 1 line
SF# 1635892: Fix docs for betavariate's input parameters .
........
r53503 | martin.v.loewis | 2007-01-20 15:05:39 +0100 (Sat, 20 Jan 2007) | 2 lines
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
........
r53504 | walter.doerwald | 2007-01-20 18:28:31 +0100 (Sat, 20 Jan 2007) | 2 lines
Port test_resource.py to unittest.
........
r53505 | walter.doerwald | 2007-01-20 19:19:33 +0100 (Sat, 20 Jan 2007) | 2 lines
Add argument tests an calls of resource.getrusage().
........
r53506 | walter.doerwald | 2007-01-20 20:03:17 +0100 (Sat, 20 Jan 2007) | 2 lines
resource.RUSAGE_BOTH might not exist.
........
r53507 | walter.doerwald | 2007-01-21 00:07:28 +0100 (Sun, 21 Jan 2007) | 2 lines
Port test_new.py to unittest.
........
r53508 | martin.v.loewis | 2007-01-21 10:33:07 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1610575: Add support for _Bool to struct.
........
r53509 | georg.brandl | 2007-01-21 11:28:43 +0100 (Sun, 21 Jan 2007) | 3 lines
Bug #1486663: don't reject keyword arguments for subclasses of builtin
types.
........
r53511 | georg.brandl | 2007-01-21 11:35:10 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1627441: close sockets properly in urllib2.
........
r53517 | georg.brandl | 2007-01-22 20:40:21 +0100 (Mon, 22 Jan 2007) | 3 lines
Use new email module names (#1637162, #1637159, #1637157).
........
r53518 | andrew.kuchling | 2007-01-22 21:26:40 +0100 (Mon, 22 Jan 2007) | 1 line
Improve pattern used for mbox 'From' lines; add a simple test
........
r53519 | andrew.kuchling | 2007-01-22 21:27:50 +0100 (Mon, 22 Jan 2007) | 1 line
Make comment match the code
........
r53522 | georg.brandl | 2007-01-22 22:10:33 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1249573: fix rfc822.parsedate not accepting a certain date format
........
r53524 | georg.brandl | 2007-01-22 22:23:41 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1627316: handle error in condition/ignore pdb commands more gracefully.
........
r53526 | lars.gustaebel | 2007-01-23 12:17:33 +0100 (Tue, 23 Jan 2007) | 4 lines
Patch #1507247: tarfile.py: use current umask for intermediate
directories.
........
r53527 | thomas.wouters | 2007-01-23 14:42:00 +0100 (Tue, 23 Jan 2007) | 13 lines
SF patch #1630975: Fix crash when replacing sys.stdout in sitecustomize
When running the interpreter in an environment that would cause it to set
stdout/stderr/stdin's encoding, having a sitecustomize that would replace
them with something other than PyFile objects would crash the interpreter.
Fix it by simply ignoring the encoding-setting for non-files.
This could do with a test, but I can think of no maintainable and portable
way to test this bug, short of adding a sitecustomize.py to the buildsystem
and have it always run with it (hmmm....)
........
r53528 | thomas.wouters | 2007-01-23 14:50:49 +0100 (Tue, 23 Jan 2007) | 4 lines
Add news entry about last checkin (oops.)
........
r53531 | martin.v.loewis | 2007-01-23 22:11:47 +0100 (Tue, 23 Jan 2007) | 4 lines
Make PyTraceBack_Here use the current thread, not the
frame's thread state. Fixes #1579370.
Will backport.
........
r53535 | brett.cannon | 2007-01-24 00:21:22 +0100 (Wed, 24 Jan 2007) | 5 lines
Fix crasher for when an object's __del__ creates a new weakref to itself.
Patch only fixes new-style classes; classic classes still buggy.
Closes bug #1377858. Already backported.
........
r53536 | walter.doerwald | 2007-01-24 01:42:19 +0100 (Wed, 24 Jan 2007) | 2 lines
Port test_popen.py to unittest.
........
2007-02-01 18:02:27 +00:00
|
|
|
margs = "a0"
|
|
|
|
for i in range(1, len(args)+1):
|
|
|
|
margs += ", a%d" % i
|
|
|
|
self.emit("#define %s(%s) _Py_%s(%s)" % (name, margs, name, margs), 0,
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
reflow=False)
|
|
|
|
self.emit("%s _Py_%s(%s);" % (ctype, name, argstr), False)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
def visitProduct(self, prod, name):
|
|
|
|
self.emit_function(name, get_c_type(name),
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
self.get_args(prod.fields), [], union=False)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class FunctionVisitor(PrototypeVisitor):
|
|
|
|
"""Visitor to generate constructor functions for AST."""
|
|
|
|
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
def emit_function(self, name, ctype, args, attrs, union=True):
|
|
|
|
def emit(s, depth=0, reflow=True):
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit(s, depth, reflow)
|
|
|
|
argstr = ", ".join(["%s %s" % (atype, aname)
|
|
|
|
for atype, aname, opt in args + attrs])
|
2005-12-17 20:54:49 +00:00
|
|
|
if argstr:
|
|
|
|
argstr += ", PyArena *arena"
|
|
|
|
else:
|
|
|
|
argstr = "PyArena *arena"
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit("%s" % ctype, 0)
|
|
|
|
emit("%s(%s)" % (name, argstr))
|
|
|
|
emit("{")
|
|
|
|
emit("%s p;" % ctype, 1)
|
|
|
|
for argtype, argname, opt in args:
|
2007-02-26 19:04:49 +00:00
|
|
|
if not opt and argtype != "int":
|
2005-10-20 19:59:25 +00:00
|
|
|
emit("if (!%s) {" % argname, 1)
|
|
|
|
emit("PyErr_SetString(PyExc_ValueError,", 2)
|
|
|
|
msg = "field %s is required for %s" % (argname, name)
|
|
|
|
emit(' "%s");' % msg,
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
2, reflow=False)
|
2005-10-20 19:59:25 +00:00
|
|
|
emit('return NULL;', 2)
|
|
|
|
emit('}', 1)
|
|
|
|
|
2005-12-17 20:54:49 +00:00
|
|
|
emit("p = (%s)PyArena_Malloc(arena, sizeof(*p));" % ctype, 1);
|
2007-02-26 18:20:15 +00:00
|
|
|
emit("if (!p)", 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
emit("return NULL;", 2)
|
|
|
|
if union:
|
|
|
|
self.emit_body_union(name, args, attrs)
|
|
|
|
else:
|
|
|
|
self.emit_body_struct(name, args, attrs)
|
|
|
|
emit("return p;", 1)
|
|
|
|
emit("}")
|
|
|
|
emit("")
|
|
|
|
|
|
|
|
def emit_body_union(self, name, args, attrs):
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
def emit(s, depth=0, reflow=True):
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit(s, depth, reflow)
|
|
|
|
emit("p->kind = %s_kind;" % name, 1)
|
|
|
|
for argtype, argname, opt in args:
|
|
|
|
emit("p->v.%s.%s = %s;" % (name, argname, argname), 1)
|
|
|
|
for argtype, argname, opt in attrs:
|
|
|
|
emit("p->%s = %s;" % (argname, argname), 1)
|
|
|
|
|
|
|
|
def emit_body_struct(self, name, args, attrs):
|
Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73196 | benjamin.peterson | 2009-06-03 20:40:29 -0500 (Wed, 03 Jun 2009) | 1 line
use the offical api
........
r73278 | benjamin.peterson | 2009-06-07 17:33:11 -0500 (Sun, 07 Jun 2009) | 1 line
inherit from object
........
r73279 | benjamin.peterson | 2009-06-07 17:35:00 -0500 (Sun, 07 Jun 2009) | 1 line
always inherit from an appropiate base class
........
r73280 | benjamin.peterson | 2009-06-07 17:54:35 -0500 (Sun, 07 Jun 2009) | 1 line
use booleans for flags
........
r73299 | georg.brandl | 2009-06-08 13:41:36 -0500 (Mon, 08 Jun 2009) | 1 line
Typo fix.
........
r73308 | benjamin.peterson | 2009-06-08 17:18:32 -0500 (Mon, 08 Jun 2009) | 1 line
remove useless assertion
........
r73312 | benjamin.peterson | 2009-06-08 18:44:13 -0500 (Mon, 08 Jun 2009) | 1 line
remove error checks already done in set_context()
........
r73313 | r.david.murray | 2009-06-08 19:44:22 -0500 (Mon, 08 Jun 2009) | 4 lines
Issue 2947: document how return code handling translates from
os.popen to subprocess. Also fixes reference link in the
os.spawn documentation.
........
r73317 | benjamin.peterson | 2009-06-09 12:24:26 -0500 (Tue, 09 Jun 2009) | 1 line
make ast.c depend on the grammar
........
r73318 | benjamin.peterson | 2009-06-09 12:29:51 -0500 (Tue, 09 Jun 2009) | 1 line
explain why keyword names are not just NAME
........
r73321 | benjamin.peterson | 2009-06-09 16:13:43 -0500 (Tue, 09 Jun 2009) | 1 line
update symbol.py from with statement changes
........
r73324 | amaury.forgeotdarc | 2009-06-09 17:53:16 -0500 (Tue, 09 Jun 2009) | 2 lines
Avoid invoking the parser/compiler just to test the presence of a function.
........
r73331 | benjamin.peterson | 2009-06-10 08:45:31 -0500 (Wed, 10 Jun 2009) | 1 line
fix spelling
........
r73335 | raymond.hettinger | 2009-06-10 11:15:40 -0500 (Wed, 10 Jun 2009) | 1 line
Fix signed/unsigned compiler warning.
........
r73340 | amaury.forgeotdarc | 2009-06-10 15:30:19 -0500 (Wed, 10 Jun 2009) | 2 lines
Fix a typo spotted by Nick Coghlan.
........
r73363 | benjamin.peterson | 2009-06-11 12:51:17 -0500 (Thu, 11 Jun 2009) | 1 line
use multi-with syntax
........
2009-06-11 22:54:11 +00:00
|
|
|
def emit(s, depth=0, reflow=True):
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit(s, depth, reflow)
|
|
|
|
for argtype, argname, opt in args:
|
|
|
|
emit("p->%s = %s;" % (argname, argname), 1)
|
|
|
|
assert not attrs
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class PickleVisitor(EmitVisitor):
|
|
|
|
|
|
|
|
def visitModule(self, mod):
|
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
|
|
|
|
|
|
|
def visitType(self, type):
|
|
|
|
self.visit(type.value, type.name)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def visitProduct(self, sum, name):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def visitConstructor(self, cons, name):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def visitField(self, sum):
|
|
|
|
pass
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
|
|
|
class Obj2ModPrototypeVisitor(PickleVisitor):
|
|
|
|
def visitProduct(self, prod, name):
|
|
|
|
code = "static int obj2ast_%s(PyObject* obj, %s* out, PyArena* arena);"
|
|
|
|
self.emit(code % (name, get_c_type(name)), 0)
|
|
|
|
|
|
|
|
visitSum = visitProduct
|
|
|
|
|
|
|
|
|
|
|
|
class Obj2ModVisitor(PickleVisitor):
|
|
|
|
def funcHeader(self, name):
|
|
|
|
ctype = get_c_type(name)
|
|
|
|
self.emit("int", 0)
|
|
|
|
self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0)
|
|
|
|
self.emit("{", 0)
|
|
|
|
self.emit("PyObject* tmp = NULL;", 1)
|
|
|
|
self.emit("", 0)
|
|
|
|
|
|
|
|
def sumTrailer(self, name):
|
|
|
|
self.emit("", 0)
|
|
|
|
self.emit("tmp = PyObject_Repr(obj);", 1)
|
|
|
|
# there's really nothing more we can do if this fails ...
|
|
|
|
self.emit("if (tmp == NULL) goto failed;", 1)
|
|
|
|
error = "expected some sort of %s, but got %%.400s" % name
|
2008-05-26 13:28:38 +00:00
|
|
|
format = "PyErr_Format(PyExc_TypeError, \"%s\", PyBytes_AS_STRING(tmp));"
|
2008-03-30 20:03:44 +00:00
|
|
|
self.emit(format % error, 1, reflow=False)
|
|
|
|
self.emit("failed:", 0)
|
|
|
|
self.emit("Py_XDECREF(tmp);", 1)
|
|
|
|
self.emit("return 1;", 1)
|
|
|
|
self.emit("}", 0)
|
|
|
|
self.emit("", 0)
|
|
|
|
|
|
|
|
def simpleSum(self, sum, name):
|
|
|
|
self.funcHeader(name)
|
|
|
|
for t in sum.types:
|
|
|
|
self.emit("if (PyObject_IsInstance(obj, (PyObject*)%s_type)) {" % t.name, 1)
|
|
|
|
self.emit("*out = %s;" % t.name, 2)
|
|
|
|
self.emit("return 0;", 2)
|
|
|
|
self.emit("}", 1)
|
|
|
|
self.sumTrailer(name)
|
|
|
|
|
|
|
|
def buildArgs(self, fields):
|
|
|
|
return ", ".join(fields + ["arena"])
|
|
|
|
|
|
|
|
def complexSum(self, sum, name):
|
|
|
|
self.funcHeader(name)
|
|
|
|
for a in sum.attributes:
|
|
|
|
self.visitAttributeDeclaration(a, name, sum=sum)
|
|
|
|
self.emit("", 0)
|
|
|
|
# XXX: should we only do this for 'expr'?
|
|
|
|
self.emit("if (obj == Py_None) {", 1)
|
|
|
|
self.emit("*out = NULL;", 2)
|
|
|
|
self.emit("return 0;", 2)
|
|
|
|
self.emit("}", 1)
|
|
|
|
for a in sum.attributes:
|
|
|
|
self.visitField(a, name, sum=sum, depth=1)
|
|
|
|
for t in sum.types:
|
|
|
|
self.emit("if (PyObject_IsInstance(obj, (PyObject*)%s_type)) {" % t.name, 1)
|
|
|
|
for f in t.fields:
|
|
|
|
self.visitFieldDeclaration(f, t.name, sum=sum, depth=2)
|
|
|
|
self.emit("", 0)
|
|
|
|
for f in t.fields:
|
|
|
|
self.visitField(f, t.name, sum=sum, depth=2)
|
|
|
|
args = [f.name.value for f in t.fields] + [a.name.value for a in sum.attributes]
|
|
|
|
self.emit("*out = %s(%s);" % (t.name, self.buildArgs(args)), 2)
|
|
|
|
self.emit("if (*out == NULL) goto failed;", 2)
|
|
|
|
self.emit("return 0;", 2)
|
|
|
|
self.emit("}", 1)
|
|
|
|
self.sumTrailer(name)
|
|
|
|
|
|
|
|
def visitAttributeDeclaration(self, a, name, sum=sum):
|
|
|
|
ctype = get_c_type(a.type)
|
|
|
|
self.emit("%s %s;" % (ctype, a.name), 1)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name):
|
|
|
|
if is_simple(sum):
|
|
|
|
self.simpleSum(sum, name)
|
|
|
|
else:
|
|
|
|
self.complexSum(sum, name)
|
|
|
|
|
|
|
|
def visitProduct(self, prod, name):
|
|
|
|
ctype = get_c_type(name)
|
|
|
|
self.emit("int", 0)
|
|
|
|
self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0)
|
|
|
|
self.emit("{", 0)
|
|
|
|
self.emit("PyObject* tmp = NULL;", 1)
|
|
|
|
for f in prod.fields:
|
|
|
|
self.visitFieldDeclaration(f, name, prod=prod, depth=1)
|
|
|
|
self.emit("", 0)
|
|
|
|
for f in prod.fields:
|
|
|
|
self.visitField(f, name, prod=prod, depth=1)
|
|
|
|
args = [f.name.value for f in prod.fields]
|
|
|
|
self.emit("*out = %s(%s);" % (name, self.buildArgs(args)), 1)
|
|
|
|
self.emit("return 0;", 1)
|
|
|
|
self.emit("failed:", 0)
|
|
|
|
self.emit("Py_XDECREF(tmp);", 1)
|
|
|
|
self.emit("return 1;", 1)
|
|
|
|
self.emit("}", 0)
|
|
|
|
self.emit("", 0)
|
|
|
|
|
|
|
|
def visitFieldDeclaration(self, field, name, sum=None, prod=None, depth=0):
|
|
|
|
ctype = get_c_type(field.type)
|
|
|
|
if field.seq:
|
|
|
|
if self.isSimpleType(field):
|
|
|
|
self.emit("asdl_int_seq* %s;" % field.name, depth)
|
|
|
|
else:
|
|
|
|
self.emit("asdl_seq* %s;" % field.name, depth)
|
|
|
|
else:
|
|
|
|
ctype = get_c_type(field.type)
|
|
|
|
self.emit("%s %s;" % (ctype, field.name), depth)
|
|
|
|
|
|
|
|
def isSimpleSum(self, field):
|
|
|
|
# XXX can the members of this list be determined automatically?
|
|
|
|
return field.type.value in ('expr_context', 'boolop', 'operator',
|
|
|
|
'unaryop', 'cmpop')
|
|
|
|
|
|
|
|
def isNumeric(self, field):
|
|
|
|
return get_c_type(field.type) in ("int", "bool")
|
|
|
|
|
|
|
|
def isSimpleType(self, field):
|
|
|
|
return self.isSimpleSum(field) or self.isNumeric(field)
|
|
|
|
|
|
|
|
def visitField(self, field, name, sum=None, prod=None, depth=0):
|
|
|
|
ctype = get_c_type(field.type)
|
|
|
|
self.emit("if (PyObject_HasAttrString(obj, \"%s\")) {" % field.name, depth)
|
|
|
|
self.emit("int res;", depth+1)
|
|
|
|
if field.seq:
|
|
|
|
self.emit("Py_ssize_t len;", depth+1)
|
|
|
|
self.emit("Py_ssize_t i;", depth+1)
|
|
|
|
self.emit("tmp = PyObject_GetAttrString(obj, \"%s\");" % field.name, depth+1)
|
|
|
|
self.emit("if (tmp == NULL) goto failed;", depth+1)
|
|
|
|
if field.seq:
|
|
|
|
self.emit("if (!PyList_Check(tmp)) {", depth+1)
|
|
|
|
self.emit("PyErr_Format(PyExc_TypeError, \"%s field \\\"%s\\\" must "
|
|
|
|
"be a list, not a %%.200s\", tmp->ob_type->tp_name);" %
|
|
|
|
(name, field.name),
|
|
|
|
depth+2, reflow=False)
|
|
|
|
self.emit("goto failed;", depth+2)
|
|
|
|
self.emit("}", depth+1)
|
|
|
|
self.emit("len = PyList_GET_SIZE(tmp);", depth+1)
|
|
|
|
if self.isSimpleType(field):
|
|
|
|
self.emit("%s = asdl_int_seq_new(len, arena);" % field.name, depth+1)
|
|
|
|
else:
|
|
|
|
self.emit("%s = asdl_seq_new(len, arena);" % field.name, depth+1)
|
|
|
|
self.emit("if (%s == NULL) goto failed;" % field.name, depth+1)
|
|
|
|
self.emit("for (i = 0; i < len; i++) {", depth+1)
|
|
|
|
self.emit("%s value;" % ctype, depth+2)
|
|
|
|
self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &value, arena);" %
|
|
|
|
field.type, depth+2, reflow=False)
|
|
|
|
self.emit("if (res != 0) goto failed;", depth+2)
|
|
|
|
self.emit("asdl_seq_SET(%s, i, value);" % field.name, depth+2)
|
|
|
|
self.emit("}", depth+1)
|
|
|
|
else:
|
|
|
|
self.emit("res = obj2ast_%s(tmp, &%s, arena);" %
|
|
|
|
(field.type, field.name), depth+1)
|
|
|
|
self.emit("if (res != 0) goto failed;", depth+1)
|
|
|
|
|
|
|
|
self.emit("Py_XDECREF(tmp);", depth+1)
|
|
|
|
self.emit("tmp = NULL;", depth+1)
|
|
|
|
self.emit("} else {", depth)
|
|
|
|
if not field.opt:
|
|
|
|
message = "required field \\\"%s\\\" missing from %s" % (field.name, name)
|
|
|
|
format = "PyErr_SetString(PyExc_TypeError, \"%s\");"
|
|
|
|
self.emit(format % message, depth+1, reflow=False)
|
|
|
|
self.emit("return 1;", depth+1)
|
|
|
|
else:
|
|
|
|
if self.isNumeric(field):
|
|
|
|
self.emit("%s = 0;" % field.name, depth+1)
|
|
|
|
elif not self.isSimpleType(field):
|
|
|
|
self.emit("%s = NULL;" % field.name, depth+1)
|
|
|
|
else:
|
|
|
|
raise TypeError("could not determine the default value for %s" % field.name)
|
|
|
|
self.emit("}", depth)
|
|
|
|
|
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
class MarshalPrototypeVisitor(PickleVisitor):
|
|
|
|
|
|
|
|
def prototype(self, sum, name):
|
|
|
|
ctype = get_c_type(name)
|
2005-11-13 18:41:28 +00:00
|
|
|
self.emit("static int marshal_write_%s(PyObject **, int *, %s);"
|
2005-10-20 19:59:25 +00:00
|
|
|
% (name, ctype), 0)
|
|
|
|
|
|
|
|
visitProduct = visitSum = prototype
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
class PyTypesDeclareVisitor(PickleVisitor):
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def visitProduct(self, prod, name):
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static PyTypeObject *%s_type;" % name, 0)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("static PyObject* ast2obj_%s(void*);" % name, 0)
|
2006-02-26 23:40:20 +00:00
|
|
|
if prod.fields:
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static char *%s_fields[]={" % name,0)
|
2006-02-26 23:40:20 +00:00
|
|
|
for f in prod.fields:
|
|
|
|
self.emit('"%s",' % f.name, 1)
|
|
|
|
self.emit("};", 0)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def visitSum(self, sum, name):
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static PyTypeObject *%s_type;" % name, 0)
|
2006-02-27 15:23:19 +00:00
|
|
|
if sum.attributes:
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static char *%s_attributes[] = {" % name, 0)
|
2006-02-27 15:23:19 +00:00
|
|
|
for a in sum.attributes:
|
|
|
|
self.emit('"%s",' % a.name, 1)
|
|
|
|
self.emit("};", 0)
|
2006-02-26 19:42:26 +00:00
|
|
|
ptype = "void*"
|
|
|
|
if is_simple(sum):
|
|
|
|
ptype = get_c_type(name)
|
|
|
|
tnames = []
|
|
|
|
for t in sum.types:
|
|
|
|
tnames.append(str(t.name)+"_singleton")
|
|
|
|
tnames = ", *".join(tnames)
|
|
|
|
self.emit("static PyObject *%s;" % tnames, 0)
|
|
|
|
self.emit("static PyObject* ast2obj_%s(%s);" % (name, ptype), 0)
|
|
|
|
for t in sum.types:
|
|
|
|
self.visitConstructor(t, name)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def visitConstructor(self, cons, name):
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static PyTypeObject *%s_type;" % cons.name, 0)
|
2006-02-26 23:40:20 +00:00
|
|
|
if cons.fields:
|
2006-02-28 22:47:29 +00:00
|
|
|
self.emit("static char *%s_fields[]={" % cons.name, 0)
|
2006-02-26 23:40:20 +00:00
|
|
|
for t in cons.fields:
|
|
|
|
self.emit('"%s",' % t.name, 1)
|
|
|
|
self.emit("};",0)
|
2006-02-26 19:42:26 +00:00
|
|
|
|
|
|
|
class PyTypesVisitor(PickleVisitor):
|
|
|
|
|
|
|
|
def visitModule(self, mod):
|
|
|
|
self.emit("""
|
2008-03-31 04:42:11 +00:00
|
|
|
static int
|
|
|
|
ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|
|
|
{
|
|
|
|
Py_ssize_t i, numfields = 0;
|
|
|
|
int res = -1;
|
|
|
|
PyObject *key, *value, *fields;
|
|
|
|
fields = PyObject_GetAttrString((PyObject*)Py_TYPE(self), "_fields");
|
|
|
|
if (!fields)
|
|
|
|
PyErr_Clear();
|
|
|
|
if (fields) {
|
|
|
|
numfields = PySequence_Size(fields);
|
|
|
|
if (numfields == -1)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
res = 0; /* if no error occurs, this stays 0 to the end */
|
|
|
|
if (PyTuple_GET_SIZE(args) > 0) {
|
|
|
|
if (numfields != PyTuple_GET_SIZE(args)) {
|
|
|
|
PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s"
|
2008-09-10 22:37:34 +00:00
|
|
|
"%zd positional argument%s",
|
2008-03-31 04:42:11 +00:00
|
|
|
Py_TYPE(self)->tp_name,
|
|
|
|
numfields == 0 ? "" : "either 0 or ",
|
|
|
|
numfields, numfields == 1 ? "" : "s");
|
|
|
|
res = -1;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
|
|
|
|
/* cannot be reached when fields is NULL */
|
|
|
|
PyObject *name = PySequence_GetItem(fields, i);
|
|
|
|
if (!name) {
|
|
|
|
res = -1;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
|
|
|
|
Py_DECREF(name);
|
|
|
|
if (res < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (kw) {
|
|
|
|
i = 0; /* needed by PyDict_Next */
|
|
|
|
while (PyDict_Next(kw, &i, &key, &value)) {
|
|
|
|
res = PyObject_SetAttr(self, key, value);
|
|
|
|
if (res < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cleanup:
|
|
|
|
Py_XDECREF(fields);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines
Adapt test_ast to the new ExceptHandler type.
........
r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines
Convert test_ast to unittest and add a test for r62049.
........
r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines
Make _fields attr for no fields consistent with _attributes attr.
........
r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines
Make AST nodes pickleable.
........
2008-03-31 05:29:39 +00:00
|
|
|
/* Pickling support */
|
|
|
|
static PyObject *
|
|
|
|
ast_type_reduce(PyObject *self, PyObject *unused)
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
PyObject *dict = PyObject_GetAttrString(self, "__dict__");
|
|
|
|
if (dict == NULL) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
|
|
PyErr_Clear();
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (dict) {
|
|
|
|
res = Py_BuildValue("O()O", Py_TYPE(self), dict);
|
|
|
|
Py_DECREF(dict);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
return Py_BuildValue("O()", Py_TYPE(self));
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef ast_type_methods[] = {
|
|
|
|
{"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
|
|
|
|
{NULL}
|
|
|
|
};
|
|
|
|
|
2008-03-31 04:42:11 +00:00
|
|
|
static PyTypeObject AST_type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines
Adapt test_ast to the new ExceptHandler type.
........
r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines
Convert test_ast to unittest and add a test for r62049.
........
r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines
Make _fields attr for no fields consistent with _attributes attr.
........
r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines
Make AST nodes pickleable.
........
2008-03-31 05:29:39 +00:00
|
|
|
"_ast.AST",
|
2008-03-31 04:42:11 +00:00
|
|
|
sizeof(PyObject),
|
|
|
|
0,
|
|
|
|
0, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2009-02-02 20:36:42 +00:00
|
|
|
0, /* tp_reserved */
|
2008-03-31 04:42:11 +00:00
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
PyObject_GenericSetAttr, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
|
|
0, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines
Adapt test_ast to the new ExceptHandler type.
........
r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines
Convert test_ast to unittest and add a test for r62049.
........
r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines
Make _fields attr for no fields consistent with _attributes attr.
........
r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines
Make AST nodes pickleable.
........
2008-03-31 05:29:39 +00:00
|
|
|
ast_type_methods, /* tp_methods */
|
2008-03-31 04:42:11 +00:00
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
(initproc)ast_type_init, /* tp_init */
|
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
PyType_GenericNew, /* tp_new */
|
|
|
|
PyObject_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
static PyTypeObject* make_type(char *type, PyTypeObject* base, char**fields, int num_fields)
|
|
|
|
{
|
|
|
|
PyObject *fnames, *result;
|
|
|
|
int i;
|
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines
Adapt test_ast to the new ExceptHandler type.
........
r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines
Convert test_ast to unittest and add a test for r62049.
........
r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines
Make _fields attr for no fields consistent with _attributes attr.
........
r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines
Make AST nodes pickleable.
........
2008-03-31 05:29:39 +00:00
|
|
|
fnames = PyTuple_New(num_fields);
|
|
|
|
if (!fnames) return NULL;
|
|
|
|
for (i = 0; i < num_fields; i++) {
|
2007-08-25 01:33:49 +00:00
|
|
|
PyObject *field = PyUnicode_FromString(fields[i]);
|
2006-02-26 19:42:26 +00:00
|
|
|
if (!field) {
|
|
|
|
Py_DECREF(fnames);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyTuple_SET_ITEM(fnames, i, field);
|
|
|
|
}
|
2007-11-02 23:07:07 +00:00
|
|
|
result = PyObject_CallFunction((PyObject*)&PyType_Type, "U(O){sOss}",
|
2006-02-27 15:23:19 +00:00
|
|
|
type, base, "_fields", fnames, "__module__", "_ast");
|
2006-02-26 19:42:26 +00:00
|
|
|
Py_DECREF(fnames);
|
|
|
|
return (PyTypeObject*)result;
|
|
|
|
}
|
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
static int add_attributes(PyTypeObject* type, char**attrs, int num_fields)
|
|
|
|
{
|
2006-04-21 10:40:58 +00:00
|
|
|
int i, result;
|
2008-03-31 04:42:11 +00:00
|
|
|
PyObject *s, *l = PyTuple_New(num_fields);
|
2006-02-27 15:23:19 +00:00
|
|
|
if (!l) return 0;
|
2006-04-21 10:40:58 +00:00
|
|
|
for(i = 0; i < num_fields; i++) {
|
2007-08-25 01:33:49 +00:00
|
|
|
s = PyUnicode_FromString(attrs[i]);
|
2006-02-27 15:23:19 +00:00
|
|
|
if (!s) {
|
|
|
|
Py_DECREF(l);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-03-31 04:42:11 +00:00
|
|
|
PyTuple_SET_ITEM(l, i, s);
|
2006-02-27 15:23:19 +00:00
|
|
|
}
|
2006-04-21 10:40:58 +00:00
|
|
|
result = PyObject_SetAttrString((PyObject*)type, "_attributes", l) >= 0;
|
|
|
|
Py_DECREF(l);
|
|
|
|
return result;
|
2006-02-27 15:23:19 +00:00
|
|
|
}
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
/* Conversion AST -> Python */
|
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
static PyObject* ast2obj_list(asdl_seq *seq, PyObject* (*func)(void*))
|
|
|
|
{
|
|
|
|
int i, n = asdl_seq_LEN(seq);
|
|
|
|
PyObject *result = PyList_New(n);
|
|
|
|
PyObject *value;
|
|
|
|
if (!result)
|
|
|
|
return NULL;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
value = func(asdl_seq_GET(seq, i));
|
|
|
|
if (!value) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyList_SET_ITEM(result, i, value);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject* ast2obj_object(void *o)
|
|
|
|
{
|
|
|
|
if (!o)
|
|
|
|
o = Py_None;
|
|
|
|
Py_INCREF((PyObject*)o);
|
|
|
|
return (PyObject*)o;
|
|
|
|
}
|
|
|
|
#define ast2obj_identifier ast2obj_object
|
|
|
|
#define ast2obj_string ast2obj_object
|
2006-02-27 15:23:19 +00:00
|
|
|
|
2007-02-26 18:20:15 +00:00
|
|
|
static PyObject* ast2obj_int(long b)
|
2006-02-27 15:23:19 +00:00
|
|
|
{
|
2007-12-02 22:43:00 +00:00
|
|
|
return PyLong_FromLong(b);
|
2006-02-27 15:23:19 +00:00
|
|
|
}
|
2008-03-30 20:03:44 +00:00
|
|
|
|
|
|
|
/* Conversion Python -> AST */
|
|
|
|
|
|
|
|
static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
|
|
|
|
{
|
|
|
|
if (obj == Py_None)
|
|
|
|
obj = NULL;
|
|
|
|
if (obj)
|
|
|
|
PyArena_AddPyObject(arena, obj);
|
|
|
|
Py_XINCREF(obj);
|
|
|
|
*out = obj;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define obj2ast_identifier obj2ast_object
|
|
|
|
#define obj2ast_string obj2ast_object
|
|
|
|
|
|
|
|
static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (!PyLong_Check(obj)) {
|
|
|
|
PyObject *s = PyObject_Repr(obj);
|
|
|
|
if (s == NULL) return 1;
|
|
|
|
PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
|
2008-05-26 13:28:38 +00:00
|
|
|
PyBytes_AS_STRING(s));
|
2008-03-30 20:03:44 +00:00
|
|
|
Py_DECREF(s);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
i = (int)PyLong_AsLong(obj);
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return 1;
|
|
|
|
*out = i;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Merged revisions 66974,66977,66984,66989,66992,66994-66996,66998-67000,67007,67015 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66974 | benjamin.peterson | 2008-10-19 08:59:01 -0500 (Sun, 19 Oct 2008) | 1 line
fix compiler warning
........
r66977 | benjamin.peterson | 2008-10-19 14:39:16 -0500 (Sun, 19 Oct 2008) | 1 line
mention -n
........
r66984 | armin.ronacher | 2008-10-20 16:29:08 -0500 (Mon, 20 Oct 2008) | 3 lines
Fixed #4062, added import for _ast.__version__ to ast to match the documented behavior.
........
r66989 | matthias.klose | 2008-10-21 04:12:25 -0500 (Tue, 21 Oct 2008) | 2 lines
- install versioned manpage
........
r66992 | benjamin.peterson | 2008-10-21 15:51:13 -0500 (Tue, 21 Oct 2008) | 1 line
make sure to call iteritems()
........
r66994 | amaury.forgeotdarc | 2008-10-21 17:01:38 -0500 (Tue, 21 Oct 2008) | 6 lines
#4157 move two test functions out of platform.py.
Turn them into unit tests, and correct an obvious typo:
(("a", "b") ("c", "d") ("e", "f"))
compiles even with the missing commas, but does not execute very well...
........
r66995 | benjamin.peterson | 2008-10-21 17:18:29 -0500 (Tue, 21 Oct 2008) | 1 line
return ArgInfo from inspect.getargvalues #4092
........
r66996 | benjamin.peterson | 2008-10-21 17:20:31 -0500 (Tue, 21 Oct 2008) | 1 line
add NEWs note for last change
........
r66998 | benjamin.peterson | 2008-10-22 15:57:43 -0500 (Wed, 22 Oct 2008) | 1 line
fix a few typos
........
r66999 | benjamin.peterson | 2008-10-22 16:05:30 -0500 (Wed, 22 Oct 2008) | 1 line
and another typo...
........
r67000 | benjamin.peterson | 2008-10-22 16:16:34 -0500 (Wed, 22 Oct 2008) | 1 line
fix #4150: pdb's up command didn't work for generators in post-mortem
........
r67007 | benjamin.peterson | 2008-10-23 16:43:48 -0500 (Thu, 23 Oct 2008) | 1 line
only nonempty __slots__ don't work
........
r67015 | georg.brandl | 2008-10-25 02:00:52 -0500 (Sat, 25 Oct 2008) | 2 lines
Typo fix.
........
2008-10-25 15:49:17 +00:00
|
|
|
static int add_ast_fields(void)
|
Merged revisions 66887,66891,66902-66903,66905-66906,66911-66913,66922,66927-66928,66936,66939-66940,66962,66964,66973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66887 | benjamin.peterson | 2008-10-13 16:51:40 -0500 (Mon, 13 Oct 2008) | 1 line
document how to disable fixers
................
r66891 | amaury.forgeotdarc | 2008-10-14 16:47:22 -0500 (Tue, 14 Oct 2008) | 5 lines
#4122: On Windows, Py_UNICODE_ISSPACE cannot be used in an extension module:
compilation fails with "undefined reference to _Py_ascii_whitespace"
Will backport to 2.6.
................
r66902 | skip.montanaro | 2008-10-15 06:49:10 -0500 (Wed, 15 Oct 2008) | 1 line
easter egg
................
r66903 | benjamin.peterson | 2008-10-15 15:34:09 -0500 (Wed, 15 Oct 2008) | 1 line
don't recurse into directories that start with '.'
................
r66905 | benjamin.peterson | 2008-10-15 16:05:55 -0500 (Wed, 15 Oct 2008) | 1 line
support the optional line argument for idle
................
r66906 | benjamin.peterson | 2008-10-15 16:58:46 -0500 (Wed, 15 Oct 2008) | 1 line
add a much requested newline
................
r66911 | benjamin.peterson | 2008-10-15 18:10:28 -0500 (Wed, 15 Oct 2008) | 41 lines
Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line
mention what the fixes directory is for
........
r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line
use assertFalse and assertTrue
........
r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line
instead of abusing the pattern matcher, use start_tree to find a next binding
........
r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line
don't print tokens to stdout when -v is given
........
r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line
add the -x option to disable fixers
........
r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line
cut down on some crud
........
r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line
add an optional set literal fixer
........
r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line
don't write backup files by default
........
r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line
add the -n option; it stops backupfiles from being written
........
................
r66912 | hirokazu.yamamoto | 2008-10-16 01:25:25 -0500 (Thu, 16 Oct 2008) | 2 lines
removed unused _PyUnicode_FromFileSystemEncodedObject.
made win32_chdir, win32_wchdir static.
................
r66913 | benjamin.peterson | 2008-10-16 13:52:14 -0500 (Thu, 16 Oct 2008) | 1 line
document that deque indexing is O(n) #4123
................
r66922 | benjamin.peterson | 2008-10-16 14:40:14 -0500 (Thu, 16 Oct 2008) | 1 line
use new showwarnings signature for idle #3391
................
r66927 | andrew.kuchling | 2008-10-16 15:15:47 -0500 (Thu, 16 Oct 2008) | 1 line
Fix wording (2.6.1 backport candidate)
................
r66928 | georg.brandl | 2008-10-16 15:20:56 -0500 (Thu, 16 Oct 2008) | 2 lines
Add more TOC to the whatsnew index page.
................
r66936 | georg.brandl | 2008-10-16 16:20:15 -0500 (Thu, 16 Oct 2008) | 2 lines
#4131: FF3 doesn't write cookies.txt files.
................
r66939 | georg.brandl | 2008-10-16 16:36:39 -0500 (Thu, 16 Oct 2008) | 2 lines
part of #4012: kill off old name "processing".
................
r66940 | georg.brandl | 2008-10-16 16:38:48 -0500 (Thu, 16 Oct 2008) | 2 lines
#4083: add "as" to except handler grammar as per PEP 3110.
................
r66962 | benjamin.peterson | 2008-10-17 15:01:01 -0500 (Fri, 17 Oct 2008) | 1 line
clarify CALL_FUNCTION #4141
................
r66964 | georg.brandl | 2008-10-17 16:41:49 -0500 (Fri, 17 Oct 2008) | 2 lines
Fix duplicate word.
................
r66973 | armin.ronacher | 2008-10-19 03:27:43 -0500 (Sun, 19 Oct 2008) | 3 lines
Fixed #4067 by implementing _attributes and _fields for the AST root node.
................
2008-10-19 14:07:49 +00:00
|
|
|
{
|
|
|
|
PyObject *empty_tuple, *d;
|
|
|
|
if (PyType_Ready(&AST_type) < 0)
|
|
|
|
return -1;
|
|
|
|
d = AST_type.tp_dict;
|
|
|
|
empty_tuple = PyTuple_New(0);
|
|
|
|
if (!empty_tuple ||
|
|
|
|
PyDict_SetItemString(d, "_fields", empty_tuple) < 0 ||
|
|
|
|
PyDict_SetItemString(d, "_attributes", empty_tuple) < 0) {
|
|
|
|
Py_XDECREF(empty_tuple);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(empty_tuple);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
""", 0, reflow=False)
|
|
|
|
|
|
|
|
self.emit("static int init_types(void)",0)
|
|
|
|
self.emit("{", 0)
|
2006-04-21 10:40:58 +00:00
|
|
|
self.emit("static int initialized;", 1)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("if (initialized) return 1;", 1)
|
Merged revisions 66887,66891,66902-66903,66905-66906,66911-66913,66922,66927-66928,66936,66939-66940,66962,66964,66973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66887 | benjamin.peterson | 2008-10-13 16:51:40 -0500 (Mon, 13 Oct 2008) | 1 line
document how to disable fixers
................
r66891 | amaury.forgeotdarc | 2008-10-14 16:47:22 -0500 (Tue, 14 Oct 2008) | 5 lines
#4122: On Windows, Py_UNICODE_ISSPACE cannot be used in an extension module:
compilation fails with "undefined reference to _Py_ascii_whitespace"
Will backport to 2.6.
................
r66902 | skip.montanaro | 2008-10-15 06:49:10 -0500 (Wed, 15 Oct 2008) | 1 line
easter egg
................
r66903 | benjamin.peterson | 2008-10-15 15:34:09 -0500 (Wed, 15 Oct 2008) | 1 line
don't recurse into directories that start with '.'
................
r66905 | benjamin.peterson | 2008-10-15 16:05:55 -0500 (Wed, 15 Oct 2008) | 1 line
support the optional line argument for idle
................
r66906 | benjamin.peterson | 2008-10-15 16:58:46 -0500 (Wed, 15 Oct 2008) | 1 line
add a much requested newline
................
r66911 | benjamin.peterson | 2008-10-15 18:10:28 -0500 (Wed, 15 Oct 2008) | 41 lines
Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line
mention what the fixes directory is for
........
r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line
use assertFalse and assertTrue
........
r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line
instead of abusing the pattern matcher, use start_tree to find a next binding
........
r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line
don't print tokens to stdout when -v is given
........
r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line
add the -x option to disable fixers
........
r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line
cut down on some crud
........
r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line
add an optional set literal fixer
........
r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line
don't write backup files by default
........
r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line
add the -n option; it stops backupfiles from being written
........
................
r66912 | hirokazu.yamamoto | 2008-10-16 01:25:25 -0500 (Thu, 16 Oct 2008) | 2 lines
removed unused _PyUnicode_FromFileSystemEncodedObject.
made win32_chdir, win32_wchdir static.
................
r66913 | benjamin.peterson | 2008-10-16 13:52:14 -0500 (Thu, 16 Oct 2008) | 1 line
document that deque indexing is O(n) #4123
................
r66922 | benjamin.peterson | 2008-10-16 14:40:14 -0500 (Thu, 16 Oct 2008) | 1 line
use new showwarnings signature for idle #3391
................
r66927 | andrew.kuchling | 2008-10-16 15:15:47 -0500 (Thu, 16 Oct 2008) | 1 line
Fix wording (2.6.1 backport candidate)
................
r66928 | georg.brandl | 2008-10-16 15:20:56 -0500 (Thu, 16 Oct 2008) | 2 lines
Add more TOC to the whatsnew index page.
................
r66936 | georg.brandl | 2008-10-16 16:20:15 -0500 (Thu, 16 Oct 2008) | 2 lines
#4131: FF3 doesn't write cookies.txt files.
................
r66939 | georg.brandl | 2008-10-16 16:36:39 -0500 (Thu, 16 Oct 2008) | 2 lines
part of #4012: kill off old name "processing".
................
r66940 | georg.brandl | 2008-10-16 16:38:48 -0500 (Thu, 16 Oct 2008) | 2 lines
#4083: add "as" to except handler grammar as per PEP 3110.
................
r66962 | benjamin.peterson | 2008-10-17 15:01:01 -0500 (Fri, 17 Oct 2008) | 1 line
clarify CALL_FUNCTION #4141
................
r66964 | georg.brandl | 2008-10-17 16:41:49 -0500 (Fri, 17 Oct 2008) | 2 lines
Fix duplicate word.
................
r66973 | armin.ronacher | 2008-10-19 03:27:43 -0500 (Sun, 19 Oct 2008) | 3 lines
Fixed #4067 by implementing _attributes and _fields for the AST root node.
................
2008-10-19 14:07:49 +00:00
|
|
|
self.emit("if (add_ast_fields() < 0) return 0;", 1)
|
2006-02-26 19:42:26 +00:00
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("initialized = 1;", 1)
|
|
|
|
self.emit("return 1;", 1);
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("}", 0)
|
|
|
|
|
|
|
|
def visitProduct(self, prod, name):
|
2006-02-26 23:40:20 +00:00
|
|
|
if prod.fields:
|
|
|
|
fields = name.value+"_fields"
|
|
|
|
else:
|
|
|
|
fields = "NULL"
|
2008-03-31 04:42:11 +00:00
|
|
|
self.emit('%s_type = make_type("%s", &AST_type, %s, %d);' %
|
2006-02-26 23:40:20 +00:00
|
|
|
(name, name, fields, len(prod.fields)), 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("if (!%s_type) return 0;" % name, 1)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def visitSum(self, sum, name):
|
2008-03-31 04:42:11 +00:00
|
|
|
self.emit('%s_type = make_type("%s", &AST_type, NULL, 0);' %
|
|
|
|
(name, name), 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("if (!%s_type) return 0;" % name, 1)
|
|
|
|
if sum.attributes:
|
2006-02-28 18:30:36 +00:00
|
|
|
self.emit("if (!add_attributes(%s_type, %s_attributes, %d)) return 0;" %
|
2006-02-27 15:23:19 +00:00
|
|
|
(name, name, len(sum.attributes)), 1)
|
|
|
|
else:
|
|
|
|
self.emit("if (!add_attributes(%s_type, NULL, 0)) return 0;" % name, 1)
|
2006-02-26 19:42:26 +00:00
|
|
|
simple = is_simple(sum)
|
|
|
|
for t in sum.types:
|
|
|
|
self.visitConstructor(t, name, simple)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def visitConstructor(self, cons, name, simple):
|
2006-02-26 23:40:20 +00:00
|
|
|
if cons.fields:
|
|
|
|
fields = cons.name.value+"_fields"
|
|
|
|
else:
|
|
|
|
fields = "NULL"
|
2006-02-28 18:30:36 +00:00
|
|
|
self.emit('%s_type = make_type("%s", %s_type, %s, %d);' %
|
2006-02-26 23:40:20 +00:00
|
|
|
(cons.name, cons.name, name, fields, len(cons.fields)), 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("if (!%s_type) return 0;" % cons.name, 1)
|
2006-02-26 19:42:26 +00:00
|
|
|
if simple:
|
|
|
|
self.emit("%s_singleton = PyType_GenericNew(%s_type, NULL, NULL);" %
|
|
|
|
(cons.name, cons.name), 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("if (!%s_singleton) return 0;" % cons.name, 1)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
def parse_version(mod):
|
|
|
|
return mod.version.value[12:-3]
|
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
class ASTModuleVisitor(PickleVisitor):
|
|
|
|
|
|
|
|
def visitModule(self, mod):
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("static struct PyModuleDef _astmodule = {", 0)
|
|
|
|
self.emit(' PyModuleDef_HEAD_INIT, "_ast"', 0)
|
|
|
|
self.emit("};", 0)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("PyMODINIT_FUNC", 0)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("PyInit__ast(void)", 0)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("{", 0)
|
|
|
|
self.emit("PyObject *m, *d;", 1)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("if (!init_types()) return NULL;", 1)
|
|
|
|
self.emit('m = PyModule_Create(&_astmodule);', 1)
|
|
|
|
self.emit("if (!m) return NULL;", 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("d = PyModule_GetDict(m);", 1)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit('if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return NULL;', 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit('if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)', 1)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("return NULL;", 2)
|
2006-02-28 00:30:54 +00:00
|
|
|
# Value of version: "$Revision$"
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
self.emit('if (PyModule_AddStringConstant(m, "__version__", "%s") < 0)'
|
|
|
|
% parse_version(mod), 1)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("return NULL;", 2)
|
2006-02-27 15:23:19 +00:00
|
|
|
for dfn in mod.dfns:
|
|
|
|
self.visit(dfn)
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit("return m;", 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.emit("}", 0)
|
|
|
|
|
|
|
|
def visitProduct(self, prod, name):
|
|
|
|
self.addObj(name)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
def visitSum(self, sum, name):
|
|
|
|
self.addObj(name)
|
|
|
|
for t in sum.types:
|
|
|
|
self.visitConstructor(t, name)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
def visitConstructor(self, cons, name):
|
|
|
|
self.addObj(cons.name)
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
def addObj(self, name):
|
2008-06-11 05:26:20 +00:00
|
|
|
self.emit('if (PyDict_SetItemString(d, "%s", (PyObject*)%s_type) < 0) return NULL;' % (name, name), 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
_SPECIALIZED_SEQUENCES = ('stmt', 'expr')
|
|
|
|
|
|
|
|
def find_sequence(fields, doing_specialization):
|
|
|
|
"""Return True if any field uses a sequence."""
|
|
|
|
for f in fields:
|
|
|
|
if f.seq:
|
|
|
|
if not doing_specialization:
|
|
|
|
return True
|
|
|
|
if str(f.type) not in _SPECIALIZED_SEQUENCES:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def has_sequence(types, doing_specialization):
|
|
|
|
for t in types:
|
|
|
|
if find_sequence(t.fields, doing_specialization):
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
class StaticVisitor(PickleVisitor):
|
2005-11-13 19:14:20 +00:00
|
|
|
CODE = '''Very simple, always emit this static code. Overide CODE'''
|
|
|
|
|
|
|
|
def visit(self, object):
|
|
|
|
self.emit(self.CODE, 0, reflow=False)
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
class ObjVisitor(PickleVisitor):
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
def func_begin(self, name):
|
2005-10-20 19:59:25 +00:00
|
|
|
ctype = get_c_type(name)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("PyObject*", 0)
|
|
|
|
self.emit("ast2obj_%s(void* _o)" % (name), 0)
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit("{", 0)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("%s o = (%s)_o;" % (ctype, ctype), 1)
|
|
|
|
self.emit("PyObject *result = NULL, *value = NULL;", 1)
|
|
|
|
self.emit('if (!o) {', 1)
|
|
|
|
self.emit("Py_INCREF(Py_None);", 2)
|
|
|
|
self.emit('return Py_None;', 2)
|
|
|
|
self.emit("}", 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit('', 0)
|
|
|
|
|
2006-02-27 15:23:19 +00:00
|
|
|
def func_end(self):
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("return result;", 1)
|
|
|
|
self.emit("failed:", 0)
|
|
|
|
self.emit("Py_XDECREF(value);", 1)
|
|
|
|
self.emit("Py_XDECREF(result);", 1)
|
|
|
|
self.emit("return NULL;", 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
self.emit("}", 0)
|
|
|
|
self.emit("", 0)
|
|
|
|
|
|
|
|
def visitSum(self, sum, name):
|
2006-02-26 19:42:26 +00:00
|
|
|
if is_simple(sum):
|
|
|
|
self.simpleSum(sum, name)
|
|
|
|
return
|
2006-02-27 15:23:19 +00:00
|
|
|
self.func_begin(name)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("switch (o->kind) {", 1)
|
|
|
|
for i in range(len(sum.types)):
|
|
|
|
t = sum.types[i]
|
|
|
|
self.visitConstructor(t, i + 1, name)
|
|
|
|
self.emit("}", 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
for a in sum.attributes:
|
|
|
|
self.emit("value = ast2obj_%s(o->%s);" % (a.type, a.name), 1)
|
|
|
|
self.emit("if (!value) goto failed;", 1)
|
2006-03-02 00:31:27 +00:00
|
|
|
self.emit('if (PyObject_SetAttrString(result, "%s", value) < 0)' % a.name, 1)
|
|
|
|
self.emit('goto failed;', 2)
|
|
|
|
self.emit('Py_DECREF(value);', 1)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.func_end()
|
2006-02-28 18:30:36 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
def simpleSum(self, sum, name):
|
|
|
|
self.emit("PyObject* ast2obj_%s(%s_ty o)" % (name, name), 0)
|
|
|
|
self.emit("{", 0)
|
|
|
|
self.emit("switch(o) {", 1)
|
|
|
|
for t in sum.types:
|
|
|
|
self.emit("case %s:" % t.name, 2)
|
|
|
|
self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
|
|
|
|
self.emit("return %s_singleton;" % t.name, 3)
|
2008-03-30 20:03:44 +00:00
|
|
|
self.emit("default:" % name, 2)
|
|
|
|
self.emit('/* should never happen, but just in case ... */', 3)
|
|
|
|
code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
|
|
|
|
self.emit(code, 3, reflow=False)
|
|
|
|
self.emit("return NULL;", 3)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("}", 1)
|
|
|
|
self.emit("}", 0)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
def visitProduct(self, prod, name):
|
2006-02-27 15:23:19 +00:00
|
|
|
self.func_begin(name)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("result = PyType_GenericNew(%s_type, NULL, NULL);" % name, 1);
|
|
|
|
self.emit("if (!result) return NULL;", 1)
|
2005-10-20 19:59:25 +00:00
|
|
|
for field in prod.fields:
|
|
|
|
self.visitField(field, name, 1, True)
|
2006-02-27 15:23:19 +00:00
|
|
|
self.func_end()
|
2005-12-25 23:18:31 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
def visitConstructor(self, cons, enum, name):
|
|
|
|
self.emit("case %s_kind:" % cons.name, 1)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("result = PyType_GenericNew(%s_type, NULL, NULL);" % cons.name, 2);
|
|
|
|
self.emit("if (!result) goto failed;", 2)
|
2005-10-20 19:59:25 +00:00
|
|
|
for f in cons.fields:
|
|
|
|
self.visitField(f, cons.name, 2, False)
|
|
|
|
self.emit("break;", 2)
|
|
|
|
|
|
|
|
def visitField(self, field, name, depth, product):
|
|
|
|
def emit(s, d):
|
|
|
|
self.emit(s, depth + d)
|
|
|
|
if product:
|
|
|
|
value = "o->%s" % field.name
|
|
|
|
else:
|
|
|
|
value = "o->v.%s.%s" % (name, field.name)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.set(field, value, depth)
|
|
|
|
emit("if (!value) goto failed;", 0)
|
|
|
|
emit('if (PyObject_SetAttrString(result, "%s", value) == -1)' % field.name, 0)
|
|
|
|
emit("goto failed;", 1)
|
|
|
|
emit("Py_DECREF(value);", 0)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
def emitSeq(self, field, value, depth, emit):
|
2006-02-26 19:42:26 +00:00
|
|
|
emit("seq = %s;" % value, 0)
|
|
|
|
emit("n = asdl_seq_LEN(seq);", 0)
|
|
|
|
emit("value = PyList_New(n);", 0)
|
|
|
|
emit("if (!value) goto failed;", 0)
|
|
|
|
emit("for (i = 0; i < n; i++) {", 0)
|
|
|
|
self.set("value", field, "asdl_seq_GET(seq, i)", depth + 1)
|
|
|
|
emit("if (!value1) goto failed;", 1)
|
|
|
|
emit("PyList_SET_ITEM(value, i, value1);", 1)
|
|
|
|
emit("value1 = NULL;", 1)
|
|
|
|
emit("}", 0)
|
|
|
|
|
|
|
|
def set(self, field, value, depth):
|
|
|
|
if field.seq:
|
2006-02-26 20:51:25 +00:00
|
|
|
# XXX should really check for is_simple, but that requires a symbol table
|
2006-02-26 19:42:26 +00:00
|
|
|
if field.type.value == "cmpop":
|
2006-02-26 20:51:25 +00:00
|
|
|
# While the sequence elements are stored as void*,
|
|
|
|
# ast2obj_cmpop expects an enum
|
|
|
|
self.emit("{", depth)
|
|
|
|
self.emit("int i, n = asdl_seq_LEN(%s);" % value, depth+1)
|
|
|
|
self.emit("value = PyList_New(n);", depth+1)
|
|
|
|
self.emit("if (!value) goto failed;", depth+1)
|
|
|
|
self.emit("for(i = 0; i < n; i++)", depth+1)
|
|
|
|
# This cannot fail, so no need for error handling
|
2006-04-21 10:40:58 +00:00
|
|
|
self.emit("PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(%s, i)));" % value,
|
|
|
|
depth+2, reflow=False)
|
2006-02-26 20:51:25 +00:00
|
|
|
self.emit("}", depth)
|
2006-02-26 19:42:26 +00:00
|
|
|
else:
|
2006-02-26 20:51:25 +00:00
|
|
|
self.emit("value = ast2obj_list(%s, ast2obj_%s);" % (value, field.type), depth)
|
2005-10-20 19:59:25 +00:00
|
|
|
else:
|
|
|
|
ctype = get_c_type(field.type)
|
2006-02-26 19:42:26 +00:00
|
|
|
self.emit("value = ast2obj_%s(%s);" % (field.type, value), depth, reflow=False)
|
2005-12-25 23:18:31 +00:00
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-02-26 19:42:26 +00:00
|
|
|
class PartingShots(StaticVisitor):
|
|
|
|
|
|
|
|
CODE = """
|
|
|
|
PyObject* PyAST_mod2obj(mod_ty t)
|
|
|
|
{
|
|
|
|
init_types();
|
|
|
|
return ast2obj_mod(t);
|
|
|
|
}
|
2008-03-30 20:03:44 +00:00
|
|
|
|
2008-03-31 04:20:05 +00:00
|
|
|
/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
|
|
|
|
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
|
2008-03-30 20:03:44 +00:00
|
|
|
{
|
|
|
|
mod_ty res;
|
2008-03-31 04:20:05 +00:00
|
|
|
PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type,
|
|
|
|
(PyObject*)Interactive_type};
|
|
|
|
char *req_name[] = {"Module", "Expression", "Interactive"};
|
|
|
|
assert(0 <= mode && mode <= 2);
|
|
|
|
|
2008-03-30 20:03:44 +00:00
|
|
|
init_types();
|
2008-03-31 04:20:05 +00:00
|
|
|
|
|
|
|
if (!PyObject_IsInstance(ast, req_type[mode])) {
|
|
|
|
PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s",
|
|
|
|
req_name[mode], Py_TYPE(ast)->tp_name);
|
2008-03-30 20:03:44 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (obj2ast_mod(ast, &res, arena) != 0)
|
|
|
|
return NULL;
|
|
|
|
else
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int PyAST_Check(PyObject* obj)
|
|
|
|
{
|
|
|
|
init_types();
|
2008-03-31 04:42:11 +00:00
|
|
|
return PyObject_IsInstance(obj, (PyObject*)&AST_type);
|
2008-03-30 20:03:44 +00:00
|
|
|
}
|
2006-02-26 19:42:26 +00:00
|
|
|
"""
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
class ChainOfVisitors:
|
|
|
|
def __init__(self, *visitors):
|
|
|
|
self.visitors = visitors
|
|
|
|
|
|
|
|
def visit(self, object):
|
|
|
|
for v in self.visitors:
|
|
|
|
v.visit(object)
|
2005-11-13 19:14:20 +00:00
|
|
|
v.emit("", 0)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2007-05-07 22:24:25 +00:00
|
|
|
common_msg = "/* File automatically generated by %s. */\n\n"
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
|
|
|
|
c_file_msg = """
|
|
|
|
/*
|
|
|
|
__version__ %s.
|
|
|
|
|
|
|
|
This module must be committed separately after each AST grammar change;
|
|
|
|
The __version__ number is set to the revision number of the commit
|
|
|
|
containing the grammar change.
|
|
|
|
*/
|
2007-05-07 22:24:25 +00:00
|
|
|
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
"""
|
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
def main(srcfile):
|
2005-12-11 21:18:22 +00:00
|
|
|
argv0 = sys.argv[0]
|
2005-12-14 18:05:14 +00:00
|
|
|
components = argv0.split(os.sep)
|
|
|
|
argv0 = os.sep.join(components[-2:])
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
auto_gen_msg = common_msg % argv0
|
2005-10-20 19:59:25 +00:00
|
|
|
mod = asdl.parse(srcfile)
|
|
|
|
if not asdl.check(mod):
|
|
|
|
sys.exit(1)
|
|
|
|
if INC_DIR:
|
|
|
|
p = "%s/%s-ast.h" % (INC_DIR, mod.name)
|
2007-11-23 21:26:49 +00:00
|
|
|
f = open(p, "w")
|
2007-05-07 22:24:25 +00:00
|
|
|
f.write(auto_gen_msg)
|
|
|
|
f.write('#include "asdl.h"\n\n')
|
2006-04-21 10:40:58 +00:00
|
|
|
c = ChainOfVisitors(TypeDefVisitor(f),
|
|
|
|
StructVisitor(f),
|
|
|
|
PrototypeVisitor(f),
|
|
|
|
)
|
|
|
|
c.visit(mod)
|
2007-05-07 22:24:25 +00:00
|
|
|
f.write("PyObject* PyAST_mod2obj(mod_ty t);\n")
|
2008-03-31 04:20:05 +00:00
|
|
|
f.write("mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);\n")
|
|
|
|
f.write("int PyAST_Check(PyObject* obj);\n")
|
2006-04-21 10:40:58 +00:00
|
|
|
f.close()
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
if SRC_DIR:
|
2006-04-21 10:40:58 +00:00
|
|
|
p = os.path.join(SRC_DIR, str(mod.name) + "-ast.c")
|
2007-11-23 21:26:49 +00:00
|
|
|
f = open(p, "w")
|
2007-05-07 22:24:25 +00:00
|
|
|
f.write(auto_gen_msg)
|
|
|
|
f.write(c_file_msg % parse_version(mod))
|
|
|
|
f.write('#include "Python.h"\n')
|
|
|
|
f.write('#include "%s-ast.h"\n' % mod.name)
|
|
|
|
f.write('\n')
|
2008-03-31 04:42:11 +00:00
|
|
|
f.write("static PyTypeObject AST_type;\n")
|
2006-04-21 10:40:58 +00:00
|
|
|
v = ChainOfVisitors(
|
|
|
|
PyTypesDeclareVisitor(f),
|
|
|
|
PyTypesVisitor(f),
|
2008-03-30 20:03:44 +00:00
|
|
|
Obj2ModPrototypeVisitor(f),
|
2006-04-21 10:40:58 +00:00
|
|
|
FunctionVisitor(f),
|
|
|
|
ObjVisitor(f),
|
2008-03-30 20:03:44 +00:00
|
|
|
Obj2ModVisitor(f),
|
2006-04-21 10:40:58 +00:00
|
|
|
ASTModuleVisitor(f),
|
|
|
|
PartingShots(f),
|
|
|
|
)
|
|
|
|
v.visit(mod)
|
|
|
|
f.close()
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
import sys
|
|
|
|
import getopt
|
|
|
|
|
|
|
|
INC_DIR = ''
|
|
|
|
SRC_DIR = ''
|
|
|
|
opts, args = getopt.getopt(sys.argv[1:], "h:c:")
|
2006-04-21 10:40:58 +00:00
|
|
|
if len(opts) != 1:
|
2007-05-07 22:24:25 +00:00
|
|
|
sys.stdout.write("Must specify exactly one output file\n")
|
2006-04-21 10:40:58 +00:00
|
|
|
sys.exit(1)
|
2005-10-20 19:59:25 +00:00
|
|
|
for o, v in opts:
|
|
|
|
if o == '-h':
|
|
|
|
INC_DIR = v
|
|
|
|
if o == '-c':
|
|
|
|
SRC_DIR = v
|
|
|
|
if len(args) != 1:
|
2007-05-07 22:24:25 +00:00
|
|
|
sys.stdout.write("Must specify single input file\n")
|
2006-04-21 10:40:58 +00:00
|
|
|
sys.exit(1)
|
2005-10-20 19:59:25 +00:00
|
|
|
main(args[0])
|