Mailman 3 September 2009 - Python-checkins

r75089 - python/branches/release26-maint/Modules/_struct.c
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 18:32:34 2009 New Revision: 75089 Log: Fix compiler warning about unused function. Modified: python/branches/release26-maint/Modules/_struct.c Modified: python/branches/release26-maint/Modules/_struct.c ============================================================================== --- python/branches/release26-maint/Modules/_struct.c (original) +++ python/branches/release26-maint/Modules/_struct.c Sun Sep 27 18:32:34 2009 @@ -182,6 +182,8 @@ /* Same, but handling unsigned long */ +#ifndef PY_STRUCT_OVERFLOW_MASKING + static int get_ulong(PyObject *v, unsigned long *p) { @@ -202,6 +204,8 @@ return 0; } +#endif /* PY_STRUCT_OVERFLOW_MASKING */ + #ifdef HAVE_LONG_LONG /* Same, but handling native long long. */

1 0

r75088 - in sandbox/trunk/2to3/lib2to3: fixes/fix_callable.py tests/test_fixers.py
by benjamin.peterson 27 Sep '09

27 Sep '09

Author: benjamin.peterson Date: Sun Sep 27 18:25:21 2009 New Revision: 75088 Log: look on the type only for __call__ Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py Sun Sep 27 18:25:21 2009 @@ -3,7 +3,7 @@ """Fixer for callable(). -This converts callable(obj) into hasattr(obj, '__call__').""" +This converts callable(obj) into hasattr(type(obj), '__call__').""" # Local imports from .. import pytree @@ -27,5 +27,8 @@ def transform(self, node, results): func = results["func"] - args = [func.clone(), String(u', '), String(u"'__call__'")] + new_func = func.clone() + new_func.prefix = u"" + type_call = Call(Name(u"type"), [new_func], prefix=func.prefix) + args = [type_call, String(u', '), String(u"'__call__'")] return Call(Name(u"hasattr"), args, prefix=node.prefix) Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Sun Sep 27 18:25:21 2009 @@ -2710,16 +2710,16 @@ def test_prefix_preservation(self): b = """callable( x)""" - a = """hasattr( x, '__call__')""" + a = """hasattr( type(x), '__call__')""" self.check(b, a) b = """if callable(x): pass""" - a = """if hasattr(x, '__call__'): pass""" + a = """if hasattr(type(x), '__call__'): pass""" self.check(b, a) def test_callable_call(self): b = """callable(x)""" - a = """hasattr(x, '__call__')""" + a = """hasattr(type(x), '__call__')""" self.check(b, a) def test_callable_should_not_change(self):

1 0

r75087 - python/branches/release26-maint/Objects/descrobject.c
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 18:17:37 2009 New Revision: 75087 Log: Remove unused variable. Modified: python/branches/release26-maint/Objects/descrobject.c Modified: python/branches/release26-maint/Objects/descrobject.c ============================================================================== --- python/branches/release26-maint/Objects/descrobject.c (original) +++ python/branches/release26-maint/Objects/descrobject.c Sun Sep 27 18:17:37 2009 @@ -1212,7 +1212,6 @@ PyObject *doc) { propertyobject *pold = (propertyobject *)old; - propertyobject *pnew = NULL; PyObject *new, *type; type = PyObject_Type(old);

1 0

r75086 - python/branches/py3k
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 18:08:13 2009 New Revision: 75086 Log: Blocked revisions 75084 via svnmerge ........ r75084 | mark.dickinson | 2009-09-27 17:05:21 +0100 (Sun, 27 Sep 2009) | 3 lines Issue #6713: Improve decimal int -> string conversions. Thanks Gawain Bolton for the suggestion and original patches. ........ Modified: python/branches/py3k/ (props changed)

1 0

r75085 - python/branches/release26-maint
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 18:06:45 2009 New Revision: 75085 Log: Blocked revisions 75084 via svnmerge ........ r75084 | mark.dickinson | 2009-09-27 17:05:21 +0100 (Sun, 27 Sep 2009) | 3 lines Issue #6713: Improve decimal int -> string conversions. Thanks Gawain Bolton for the suggestion and original patches. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r75084 - in python/trunk: Misc/NEWS Objects/intobject.c
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 18:05:21 2009 New Revision: 75084 Log: Issue #6713: Improve decimal int -> string conversions. Thanks Gawain Bolton for the suggestion and original patches. Modified: python/trunk/Misc/NEWS python/trunk/Objects/intobject.c Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Sep 27 18:05:21 2009 @@ -18,7 +18,8 @@ - Issue #6922: Fix an infinite loop when trying to decode an invalid UTF-32 stream with a non-raising error handler like "replace" or "ignore". -- Issue #6713: Improve performance of integer -> string conversions. +- Issue #6713: Improve performance of base 10 int -> string and + long -> string conversions. - Issue #1590864: Fix potential deadlock when mixing threads and fork(). Modified: python/trunk/Objects/intobject.c ============================================================================== --- python/trunk/Objects/intobject.c (original) +++ python/trunk/Objects/intobject.c Sun Sep 27 18:05:21 2009 @@ -436,12 +436,6 @@ return 0; } -static PyObject * -int_repr(PyIntObject *v) -{ - return _PyInt_Format(v, 10, 0); -} - static int int_compare(PyIntObject *v, PyIntObject *w) { @@ -1113,6 +1107,26 @@ return PyInt_FromLong(1L); } +/* Convert an integer to a decimal string. On many platforms, this + will be significantly faster than the general arbitrary-base + conversion machinery in _PyInt_Format, thanks to optimization + opportunities offered by division by a compile-time constant. */ +static PyObject * +int_to_decimal_string(PyIntObject *v) { + char buf[sizeof(long)*CHAR_BIT/3+6], *p, *bufend; + long n = v->ob_ival; + unsigned long absn; + p = bufend = buf + sizeof(buf); + absn = n < 0 ? -(unsigned long)n : n; + do { + *--p = '0' + absn % 10; + absn /= 10; + } while (absn); + if (n < 0) + *--p = '-'; + return PyString_FromStringAndSize(p, bufend - p); +} + /* Convert an integer to the given base. Returns a string. If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. If newstyle is zero, then use the pre-2.6 behavior of octal having @@ -1137,6 +1151,10 @@ assert(base >= 2 && base <= 36); + /* Special case base 10, for speed */ + if (base == 10) + return int_to_decimal_string(v); + do { /* I'd use i_divmod, except it doesn't produce the results I want when n is negative. So just duplicate the salient @@ -1169,7 +1187,7 @@ *--p = 'x'; *--p = '0'; } - else if (base != 10) { + else { *--p = '#'; *--p = '0' + base%10; if (base > 10) @@ -1341,13 +1359,13 @@ 0, /* tp_getattr */ 0, /* tp_setattr */ (cmpfunc)int_compare, /* tp_compare */ - (reprfunc)int_repr, /* tp_repr */ + (reprfunc)int_to_decimal_string, /* tp_repr */ &int_as_number, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ (hashfunc)int_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)int_repr, /* tp_str */ + 0, /* tp_call */ + (reprfunc)int_to_decimal_string, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */

1 0

r75083 - python/branches/release26-maint/Objects/stringlib/formatter.h
by mark.dickinson 27 Sep '09

27 Sep '09

Author: mark.dickinson Date: Sun Sep 27 17:53:49 2009 New Revision: 75083 Log: Silence compiler warning Modified: python/branches/release26-maint/Objects/stringlib/formatter.h Modified: python/branches/release26-maint/Objects/stringlib/formatter.h ============================================================================== --- python/branches/release26-maint/Objects/stringlib/formatter.h (original) +++ python/branches/release26-maint/Objects/stringlib/formatter.h Sun Sep 27 17:53:49 2009 @@ -31,7 +31,7 @@ PyErr_Format(PyExc_ValueError, "Unknown format code '%c' " "for object of type '%.200s'", - presentation_type, + (char)presentation_type, type_name); #if STRINGLIB_IS_UNICODE else

1 0

r75082 - python/branches/py3k/Python/ast.c
by benjamin.peterson 27 Sep '09

27 Sep '09

Author: benjamin.peterson Date: Sun Sep 27 16:08:59 2009 New Revision: 75082 Log: star_expr now always has two nodes Modified: python/branches/py3k/Python/ast.c Modified: python/branches/py3k/Python/ast.c ============================================================================== --- python/branches/py3k/Python/ast.c (original) +++ python/branches/py3k/Python/ast.c Sun Sep 27 16:08:59 2009 @@ -1889,9 +1889,7 @@ break; case star_expr: - if (TYPE(CHILD(n, 0)) == STAR) - return ast_for_starred(c, n); - /* Fall through to generic case. */ + return ast_for_starred(c, n); /* The next five cases all handle BinOps. The main body of code is the same in each case, but the switch turned inside out to reuse the code for each type of operator.

1 0

Re: [Python-checkins] r75053 - in sandbox/trunk/dev: why.rst workflow.rst
by Antoine Pitrou 27 Sep '09

27 Sep '09

<andrew.kuchling> writes: > > + > + There's a core group of around 60 developers. I think we are around 100 now. Regards Antoine.

6 7

r75081 - in sandbox/trunk/2to3/lib2to3: Grammar.txt tests/test_parser.py
by benjamin.peterson 27 Sep '09

27 Sep '09

Author: benjamin.peterson Date: Sun Sep 27 05:02:57 2009 New Revision: 75081 Log: let 2to3 work with extended iterable unpacking Modified: sandbox/trunk/2to3/lib2to3/Grammar.txt sandbox/trunk/2to3/lib2to3/tests/test_parser.py Modified: sandbox/trunk/2to3/lib2to3/Grammar.txt ============================================================================== --- sandbox/trunk/2to3/lib2to3/Grammar.txt (original) +++ sandbox/trunk/2to3/lib2to3/Grammar.txt Sun Sep 27 05:02:57 2009 @@ -53,8 +53,9 @@ simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE small_stmt: (expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | exec_stmt | assert_stmt) -expr_stmt: testlist (augassign (yield_expr|testlist) | - ('=' (yield_expr|testlist))*) +expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | + ('=' (yield_expr|testlist_star_expr))*) +testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [','] augassign: ('+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=') # For normal assignments, additional restrictions enforced by the interpreter @@ -112,6 +113,7 @@ not_test: 'not' not_test | comparison comparison: expr (comp_op expr)* comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not' +star_expr: '*' expr expr: xor_expr ('|' xor_expr)* xor_expr: and_expr ('^' and_expr)* and_expr: shift_expr ('&' shift_expr)* @@ -125,14 +127,14 @@ '{' [dictsetmaker] '}' | '`' testlist1 '`' | NAME | NUMBER | STRING+ | '.' '.' '.') -listmaker: test ( comp_for | (',' test)* [','] ) -testlist_gexp: test ( comp_for | (',' test)* [','] ) +listmaker: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] ) +testlist_gexp: test ( comp_for | (',' (test|star_expr))* [','] ) lambdef: 'lambda' [varargslist] ':' test trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME subscriptlist: subscript (',' subscript)* [','] subscript: test | [test] ':' [test] [sliceop] sliceop: ':' [test] -exprlist: expr (',' expr)* [','] +exprlist: (expr|star_expr) (',' (expr|star_expr))* [','] testlist: test (',' test)* [','] dictsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) | (test (comp_for | (',' test)* [','])) ) Modified: sandbox/trunk/2to3/lib2to3/tests/test_parser.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_parser.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_parser.py Sun Sep 27 05:02:57 2009 @@ -161,6 +161,11 @@ if diff(filepath, new): self.fail("Idempotency failed: %s" % filepath) + def test_extended_unpacking(self): + driver.parse_string("a, *b, c = x\n") + driver.parse_string("[*a, b] = x\n") + driver.parse_string("(z, *y, w) = m\n") + driver.parse_string("for *z, m in d: pass\n") class TestLiterals(GrammarTest):

1 0