Mailman 3 February 2007 - Python-checkins

r53974 - in python/branches/release25-maint: Misc/NEWS Python/errors.c
by neal.norwitz Feb. 26, 2007

Feb. 26, 2007

Author: neal.norwitz Date: Tue Feb 27 00:46:51 2007 New Revision: 53974 Modified: python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Python/errors.c Log: Fix SF bug #1669182. Handle string exceptions even if unraisable (ie in __del__). Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Tue Feb 27 00:46:51 2007 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- Bug #1669182: prevent crash when trying to print an unraisable error + from a string exception. + - Bug #1653736: Properly discard third argument to slot_nb_inplace_power. - SF #151204: enumerate() now raises an Overflow error at sys.maxint items. Modified: python/branches/release25-maint/Python/errors.c ============================================================================== --- python/branches/release25-maint/Python/errors.c (original) +++ python/branches/release25-maint/Python/errors.c Tue Feb 27 00:46:51 2007 @@ -590,7 +590,11 @@ PyFile_WriteString("Exception ", f); if (t) { PyObject* moduleName; - char* className = PyExceptionClass_Name(t); + char* className = NULL; + if (PyExceptionClass_Check(t)) + className = PyExceptionClass_Name(t); + else if (PyString_Check(t)) + className = PyString_AS_STRING(t); if (className != NULL) { char *dot = strrchr(className, '.');

1 0

r53971 - python/branches/release25-maint/Doc/lib/libgettext.tex
by andrew.kuchling Feb. 26, 2007

Feb. 26, 2007

Author: andrew.kuchling Date: Tue Feb 27 00:03:03 2007 New Revision: 53971 Modified: python/branches/release25-maint/Doc/lib/libgettext.tex Log: Markup fix Modified: python/branches/release25-maint/Doc/lib/libgettext.tex ============================================================================== --- python/branches/release25-maint/Doc/lib/libgettext.tex (original) +++ python/branches/release25-maint/Doc/lib/libgettext.tex Tue Feb 27 00:03:03 2007 @@ -102,9 +102,9 @@ return \var{plural} otherwise. The Plural formula is taken from the catalog header. It is a C or -Python expression that has a free variable n; the expression evaluates +Python expression that has a free variable \var{n}; the expression evaluates to the index of the plural in the catalog. See the GNU gettext -documentation for the precise syntax to be used in .po files, and the +documentation for the precise syntax to be used in \file{.po} files and the formulas for a variety of languages. \versionadded{2.3}

1 0

r53970 - python/trunk/Doc/lib/libgettext.tex
by andrew.kuchling Feb. 26, 2007

Feb. 26, 2007

Author: andrew.kuchling Date: Tue Feb 27 00:02:47 2007 New Revision: 53970 Modified: python/trunk/Doc/lib/libgettext.tex Log: Markup fix Modified: python/trunk/Doc/lib/libgettext.tex ============================================================================== --- python/trunk/Doc/lib/libgettext.tex (original) +++ python/trunk/Doc/lib/libgettext.tex Tue Feb 27 00:02:47 2007 @@ -102,9 +102,9 @@ return \var{plural} otherwise. The Plural formula is taken from the catalog header. It is a C or -Python expression that has a free variable n; the expression evaluates +Python expression that has a free variable \var{n}; the expression evaluates to the index of the plural in the catalog. See the GNU gettext -documentation for the precise syntax to be used in .po files, and the +documentation for the precise syntax to be used in \file{.po} files and the formulas for a variety of languages. \versionadded{2.3}

1 0

r53969 - in python/trunk: Lib/test/test_generators.py Misc/NEWS Python/errors.c
by neal.norwitz Feb. 26, 2007

Feb. 26, 2007

Author: neal.norwitz Date: Mon Feb 26 23:41:45 2007 New Revision: 53969 Modified: python/trunk/Lib/test/test_generators.py python/trunk/Misc/NEWS python/trunk/Python/errors.c Log: When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. Modified: python/trunk/Lib/test/test_generators.py ============================================================================== --- python/trunk/Lib/test/test_generators.py (original) +++ python/trunk/Lib/test/test_generators.py Mon Feb 26 23:41:45 2007 @@ -1681,7 +1681,7 @@ >>> g.next() >>> del g >>> sys.stderr.getvalue().startswith( -... "Exception exceptions.RuntimeError: 'generator ignored GeneratorExit' in " +... "Exception RuntimeError: 'generator ignored GeneratorExit' in " ... ) True >>> sys.stderr = old @@ -1798,7 +1798,7 @@ ... del l ... err = sys.stderr.getvalue().strip() ... err.startswith( -... "Exception exceptions.RuntimeError: RuntimeError() in <" +... "Exception RuntimeError: RuntimeError() in <" ... ) ... err.endswith("> ignored") ... len(err.splitlines()) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Feb 26 23:41:45 2007 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- When printing an unraisable error, don't print exceptions. before the name. + This duplicates the behavior whening normally printing exceptions. + - Bug #1653736: Properly discard third argument to slot_nb_inplace_power. - PEP 352: Raising a string exception now triggers a TypeError. Attempting to Modified: python/trunk/Python/errors.c ============================================================================== --- python/trunk/Python/errors.c (original) +++ python/trunk/Python/errors.c Mon Feb 26 23:41:45 2007 @@ -603,7 +603,8 @@ PyFile_WriteString("<unknown>", f); else { char* modstr = PyString_AsString(moduleName); - if (modstr) + if (modstr && + strcmp(modstr, "exceptions") != 0) { PyFile_WriteString(modstr, f); PyFile_WriteString(".", f);

1 0

r53968 - in python/branches/twouters-dictviews-backport: Lib/__future__.py Lib/compiler/consts.py Lib/compiler/future.py Lib/compiler/pyassem.py Lib/compiler/pycodegen.py Lib/test/test_compiler.py Lib/test/test_dict.py Python/bltinmodule.c
by thomas.wouters Feb. 26, 2007

Feb. 26, 2007

Author: thomas.wouters Date: Mon Feb 26 23:24:25 2007 New Revision: 53968 Modified: python/branches/twouters-dictviews-backport/Lib/__future__.py python/branches/twouters-dictviews-backport/Lib/compiler/consts.py python/branches/twouters-dictviews-backport/Lib/compiler/future.py python/branches/twouters-dictviews-backport/Lib/compiler/pyassem.py python/branches/twouters-dictviews-backport/Lib/compiler/pycodegen.py python/branches/twouters-dictviews-backport/Lib/test/test_compiler.py python/branches/twouters-dictviews-backport/Lib/test/test_dict.py python/branches/twouters-dictviews-backport/Python/bltinmodule.c Log: Add some dictview tests, and compiler support plus tests. Modified: python/branches/twouters-dictviews-backport/Lib/__future__.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/__future__.py (original) +++ python/branches/twouters-dictviews-backport/Lib/__future__.py Mon Feb 26 23:24:25 2007 @@ -53,6 +53,7 @@ "division", "absolute_import", "with_statement", + "dictviews", ] __all__ = ["all_feature_names"] + all_feature_names Modified: python/branches/twouters-dictviews-backport/Lib/compiler/consts.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/compiler/consts.py (original) +++ python/branches/twouters-dictviews-backport/Lib/compiler/consts.py Mon Feb 26 23:24:25 2007 @@ -19,3 +19,4 @@ CO_FUTURE_DIVISION = 0x2000 CO_FUTURE_ABSIMPORT = 0x4000 CO_FUTURE_WITH_STATEMENT = 0x8000 +CO_FUTURE_DICTVIEWS = 0x10000 Modified: python/branches/twouters-dictviews-backport/Lib/compiler/future.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/compiler/future.py (original) +++ python/branches/twouters-dictviews-backport/Lib/compiler/future.py Mon Feb 26 23:24:25 2007 @@ -16,7 +16,7 @@ class FutureParser: features = ("nested_scopes", "generators", "division", - "absolute_import", "with_statement") + "absolute_import", "with_statement", "dictviews") def __init__(self): self.found = {} # set Modified: python/branches/twouters-dictviews-backport/Lib/compiler/pyassem.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/compiler/pyassem.py (original) +++ python/branches/twouters-dictviews-backport/Lib/compiler/pyassem.py Mon Feb 26 23:24:25 2007 @@ -533,6 +533,9 @@ _convert_STORE_ATTR = _convert_NAME _convert_LOAD_ATTR = _convert_NAME _convert_DELETE_ATTR = _convert_NAME + _convert_STORE_VIEWATTR = _convert_NAME + _convert_LOAD_VIEWATTR = _convert_NAME + _convert_DELETE_VIEWATTR = _convert_NAME _convert_LOAD_GLOBAL = _convert_NAME _convert_STORE_GLOBAL = _convert_NAME _convert_DELETE_GLOBAL = _convert_NAME @@ -766,7 +769,9 @@ 'BUILD_CLASS': -2, 'STORE_NAME': -1, 'STORE_ATTR': -2, + 'STORE_VIEWATTR': -2, 'DELETE_ATTR': -1, + 'DELETE_VIEWATTR': -1, 'STORE_GLOBAL': -1, 'BUILD_MAP': 1, 'COMPARE_OP': -1, @@ -775,6 +780,7 @@ 'IMPORT_NAME': -1, 'IMPORT_FROM': 1, 'LOAD_ATTR': 0, # unlike other loads + 'LOAD_VIEWATTR': 0, # close enough... 'SETUP_EXCEPT': 3, 'SETUP_FINALLY': 3, Modified: python/branches/twouters-dictviews-backport/Lib/compiler/pycodegen.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/compiler/pycodegen.py (original) +++ python/branches/twouters-dictviews-backport/Lib/compiler/pycodegen.py Mon Feb 26 23:24:25 2007 @@ -10,7 +10,7 @@ from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL from compiler.consts import (CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS, CO_NESTED, CO_GENERATOR, CO_FUTURE_DIVISION, - CO_FUTURE_ABSIMPORT, CO_FUTURE_WITH_STATEMENT) + CO_FUTURE_ABSIMPORT, CO_FUTURE_WITH_STATEMENT, CO_FUTURE_DICTVIEWS) from compiler.pyassem import TupleArg # XXX The version-specific code can go, since this code only works with 2.x. @@ -218,6 +218,8 @@ self.graph.setFlag(CO_FUTURE_ABSIMPORT) elif feature == "with_statement": self.graph.setFlag(CO_FUTURE_WITH_STATEMENT) + elif feature == "dictviews": + self.graph.setFlag(CO_FUTURE_DICTVIEWS) def initClass(self): """This method is called once for each class""" @@ -929,9 +931,18 @@ for elt in elts[1:]: self.emit('LOAD_ATTR', elt) + def _checkViewAttr(self, regop, viewop, attrname): + if (self.graph.checkFlag(CO_FUTURE_DICTVIEWS) and + attrname in ('keys', 'items', 'values')): + return viewop + else: + return regop + def visitGetattr(self, node): self.visit(node.expr) - self.emit('LOAD_ATTR', self.mangle(node.attrname)) + load_op = self._checkViewAttr('LOAD_ATTR', 'LOAD_VIEWATTR', + node.attrname) + self.emit(load_op, self.mangle(node.attrname)) # next five implement assignments @@ -958,9 +969,13 @@ def visitAssAttr(self, node): self.visit(node.expr) if node.flags == 'OP_ASSIGN': - self.emit('STORE_ATTR', self.mangle(node.attrname)) + op = self._checkViewAttr('STORE_ATTR', 'STORE_VIEWATTR', + node.attrname) + self.emit(op, self.mangle(node.attrname)) elif node.flags == 'OP_DELETE': - self.emit('DELETE_ATTR', self.mangle(node.attrname)) + op = self._checkViewAttr('DELETE_ATTR', 'DELETE_VIEWATTR', + node.attrname) + self.emit(op, self.mangle(node.attrname)) else: print "warning: unexpected flags:", node.flags print node @@ -1016,10 +1031,14 @@ if mode == "load": self.visit(node.expr) self.emit('DUP_TOP') - self.emit('LOAD_ATTR', self.mangle(node.attrname)) + op = self._checkViewAttr('LOAD_ATTR', 'LOAD_VIEWATTR', + node.attrname) + self.emit(op, self.mangle(node.attrname)) elif mode == "store": self.emit('ROT_TWO') - self.emit('STORE_ATTR', self.mangle(node.attrname)) + op = self._checkViewAttr('STORE_ATTR', 'STORE_VIEWATTR', + node.attrname) + self.emit(op, self.mangle(node.attrname)) def visitAugSlice(self, node, mode): if mode == "load": Modified: python/branches/twouters-dictviews-backport/Lib/test/test_compiler.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/test/test_compiler.py (original) +++ python/branches/twouters-dictviews-backport/Lib/test/test_compiler.py Mon Feb 26 23:24:25 2007 @@ -154,6 +154,40 @@ exec c in dct self.assertEquals(dct.get('result'), 1) + def testDictViews(self): + class Dict(dict): pass + class NonDict: + def keys(self): pass + def items(self): pass + def values(self): pass + def viewkeys(self): pass + def viewitems(self): pass + def viewvalues(self): pass + c = compiler.compile('from __future__ import dictviews\n' + 'keys, items, values = d.keys, d.items, d.values\n', + '<string>', + 'exec') + obj = {} + dct = {'d': obj} + exec c in dct + self.assertEquals(dct['keys'].__name__, obj.viewkeys.__name__) + self.assertEquals(dct['items'].__name__, obj.viewitems.__name__) + self.assertEquals(dct['values'].__name__, obj.viewvalues.__name__) + + obj = Dict() + dct = {'d': obj} + exec c in dct + self.assertEquals(dct['keys'].__name__, obj.viewkeys.__name__) + self.assertEquals(dct['items'].__name__, obj.viewitems.__name__) + self.assertEquals(dct['values'].__name__, obj.viewvalues.__name__) + + obj = NonDict() + dct = {'d': obj} + exec c in dct + self.assertEquals(dct['keys'].__name__, obj.keys.__name__) + self.assertEquals(dct['items'].__name__, obj.items.__name__) + self.assertEquals(dct['values'].__name__, obj.values.__name__) + NOLINENO = (compiler.ast.Module, compiler.ast.Stmt, compiler.ast.Discard) Modified: python/branches/twouters-dictviews-backport/Lib/test/test_dict.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/test/test_dict.py (original) +++ python/branches/twouters-dictviews-backport/Lib/test/test_dict.py Mon Feb 26 23:24:25 2007 @@ -56,7 +56,7 @@ def test_items(self): d = {} - self.assertEqual(list(d.items(), []) + self.assertEqual(list(d.items()), []) d = {1:2} self.assertEqual(d.items(), [(1, 2)]) @@ -491,6 +491,89 @@ else: self.fail("missing KeyError") + def test_dictviews_future(self): + import __future__ + + d = {'a': 1, 'b': 2, 'c': 3} + c = compile("d.keys", "d.keys", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.keys.__name__) + c = compile("d.items", "d.items", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.items.__name__) + c = compile("d.values", "d.values", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.values.__name__) + c = compile("d.keys", "d.keys", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewkeys.__name__) + c = compile("d.items", "d.items", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewitems.__name__) + c = compile("d.values", "d.values", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewvalues.__name__) + + d = Dict(a=1, b=2, c=3) + c = compile("d.keys", "d.keys", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.keys.__name__) + c = compile("d.items", "d.items", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.items.__name__) + c = compile("d.values", "d.values", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.values.__name__) + c = compile("d.keys", "d.keys", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewkeys.__name__) + c = compile("d.items", "d.items", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewitems.__name__) + c = compile("d.values", "d.values", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.viewvalues.__name__) + + class NonDict: + def __init__(self, *args, **kwargs): + self.d = dict(*args, **kwargs) + def keys(self): return self.d.keys() + def items(self): return self.d.items() + def values(self): return self.d.values() + # these should *not* end up being used + def viewkeys(self): pass + def viewitems(self): pass + def viewvalues(self): pass + + d = NonDict(a=1, b=2, c=3) + c = compile("d.keys", "d.keys", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.keys.__name__) + c = compile("d.items", "d.items", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.items.__name__) + c = compile("d.values", "d.values", "eval", 0) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.values.__name__) + c = compile("d.keys", "d.keys", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.keys.__name__) + c = compile("d.items", "d.items", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.items.__name__) + c = compile("d.values", "d.values", "eval", + __future__.CO_FUTURE_DICTVIEWS) + k = eval(c, locals()) + self.assertEquals(k.__name__, d.values.__name__) + from test import mapping_tests Modified: python/branches/twouters-dictviews-backport/Python/bltinmodule.c ============================================================================== --- python/branches/twouters-dictviews-backport/Python/bltinmodule.c (original) +++ python/branches/twouters-dictviews-backport/Python/bltinmodule.c Mon Feb 26 23:24:25 2007 @@ -1079,6 +1079,8 @@ result = _PyObject_SetViewAttr(v, name, (PyObject *)NULL); } else result = PyObject_SetAttr(v, name, (PyObject *)NULL); + if (result != 0) + return NULL; Py_INCREF(Py_None); return Py_None; }

1 0

r53959 - python/branches/twouters-dictviews-backport/Python/bltinmodule.c
by thomas.wouters Feb. 26, 2007

Feb. 26, 2007

Author: thomas.wouters Date: Mon Feb 26 22:03:20 2007 New Revision: 53959 Modified: python/branches/twouters-dictviews-backport/Python/bltinmodule.c Log: dictviews-future support for getattr/setattr/delattr. Modified: python/branches/twouters-dictviews-backport/Python/bltinmodule.c ============================================================================== --- python/branches/twouters-dictviews-backport/Python/bltinmodule.c (original) +++ python/branches/twouters-dictviews-backport/Python/bltinmodule.c Mon Feb 26 22:03:20 2007 @@ -5,6 +5,7 @@ #include "node.h" #include "code.h" #include "eval.h" +#include "frameobject.h" #include <ctype.h> @@ -718,6 +719,7 @@ { PyObject *v, *result, *dflt = NULL; PyObject *name; + const char *sname; if (!PyArg_UnpackTuple(args, "getattr", 2, 3, &v, &name, &dflt)) return NULL; @@ -734,7 +736,16 @@ "getattr(): attribute name must be string"); return NULL; } - result = PyObject_GetAttr(v, name); + sname = PyString_AS_STRING(name); + /* Do some magic to see if the caller wanted dictviews or not */ + if ((strcmp(sname, "keys") == 0 || + strcmp(sname, "items") == 0 || + strcmp(sname, "values") == 0) && + (PyThreadState_GET()->frame->f_code->co_flags & + CO_FUTURE_DICTVIEWS)) { + result = _PyObject_GetViewAttr(v, name); + } else + result = PyObject_GetAttr(v, name); if (result == NULL && dflt != NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) { @@ -994,10 +1005,35 @@ PyObject *v; PyObject *name; PyObject *value; + const char *sname; + int result; if (!PyArg_UnpackTuple(args, "setattr", 3, 3, &v, &name, &value)) return NULL; - if (PyObject_SetAttr(v, name, value) != 0) +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(name)) { + name = _PyUnicode_AsDefaultEncodedString(name, NULL); + if (name == NULL) + return NULL; + } +#endif + + if (!PyString_Check(name)) { + PyErr_SetString(PyExc_TypeError, + "setattr(): attribute name must be string"); + return NULL; + } + sname = PyString_AS_STRING(name); + /* Do some magic to see if the caller wanted dictviews or not */ + if ((strcmp(sname, "keys") == 0 || + strcmp(sname, "items") == 0 || + strcmp(sname, "values") == 0) && + (PyThreadState_GET()->frame->f_code->co_flags & + CO_FUTURE_DICTVIEWS)) { + result = _PyObject_SetViewAttr(v, name, value); + } else + result = PyObject_SetAttr(v, name, value); + if (result != 0) return NULL; Py_INCREF(Py_None); return Py_None; @@ -1015,11 +1051,34 @@ { PyObject *v; PyObject *name; + const char *sname; + int result; if (!PyArg_UnpackTuple(args, "delattr", 2, 2, &v, &name)) return NULL; - if (PyObject_SetAttr(v, name, (PyObject *)NULL) != 0) +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(name)) { + name = _PyUnicode_AsDefaultEncodedString(name, NULL); + if (name == NULL) + return NULL; + } +#endif + + if (!PyString_Check(name)) { + PyErr_SetString(PyExc_TypeError, + "delattr(): attribute name must be string"); return NULL; + } + sname = PyString_AS_STRING(name); + /* Do some magic to see if the caller wanted dictviews or not */ + if ((strcmp(sname, "keys") == 0 || + strcmp(sname, "items") == 0 || + strcmp(sname, "values") == 0) && + (PyThreadState_GET()->frame->f_code->co_flags & + CO_FUTURE_DICTVIEWS)) { + result = _PyObject_SetViewAttr(v, name, (PyObject *)NULL); + } else + result = PyObject_SetAttr(v, name, (PyObject *)NULL); Py_INCREF(Py_None); return Py_None; }

1 0

Why? Re: r53925 - sandbox/trunk/pep362/pep362.py
by Jim Jewett Feb. 26, 2007

Feb. 26, 2007

Why are you removing the __str__ function? For me, (1) one of the more frustrating parts of the introspection API is that you can't (easily) use it to create a new "similar" function. (2) one of the main uses of introspection is seeing what I have -- and "equivalent" source code is a useful output format. On 2/25/07, brett.cannon <python-checkins(a)python.org> wrote: > Author: brett.cannon > Date: Sun Feb 25 23:59:37 2007 > New Revision: 53925 > > Modified: > sandbox/trunk/pep362/pep362.py > Log: > Remove __str__ support. > > > Modified: sandbox/trunk/pep362/pep362.py > ============================================================================== > --- sandbox/trunk/pep362/pep362.py (original) > +++ sandbox/trunk/pep362/pep362.py Sun Feb 25 23:59:37 2007 > @@ -49,27 +49,6 @@ > self.has_annotation = True > self.annotation = annotation > > - def _tuple2param(self, tuple_): > - if not isinstance(tuple_, tuple): > - return str(tuple_) > - elif len(tuple_) == 1: > - return "(" + str(tuple_[0]) +",)" > - else: > - return ('(' + > - ', '.join(self._tuple2param(x) for x in tuple_) + > - ')') > - > - def __str__(self): > - """Return the string representation of the parameter as it would look > - in a function's signature.""" > - if isinstance(self.name, tuple): > - result = self._tuple2param(self.name) > - else: > - result = self.name > - if self.has_default: > - result+= "=" + str(self.default_value) > - return result > - > > class Signature(object): > > @@ -92,7 +71,8 @@ > keyword_only_count = func_code.co_kwonlyargcount > else: > keyword_only_count = 0 > - positional = func_code.co_varnames[:pos_count] > + #positional = func_code.co_varnames[:pos_count] > + positional = argspec[0] > keyword_only = func_code.co_varnames[pos_count:keyword_only_count] > if func.func_defaults: > pos_default_count = len(func.func_defaults) > @@ -178,22 +158,6 @@ > else: > return tuple(cls._list2tuple(x) for x in list_) > > - def __str__(self): > - """String representation of a signature as one might write it in source > - code.""" > - result = "%s(" % self.name > - result += ", ".join(str(param) for param in self.parameters) > - if self.var_args: > - if self.parameters: > - result +=", " > - result += "*%s" % self.var_args > - if self.var_kw_args: > - if self.parameters or self.var_args: > - result += ", " > - result += "**%s" % self.var_kw_args > - result += ")" > - return result > - > def bind(self, *args, **kwargs): > """Return a dictionary mapping function arguments to their parameter > variables, if possible. > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins >

3 3

r53958 - in python/branches/twouters-dictviews-backport: Include/code.h Include/compile.h Include/object.h Include/opcode.h Include/pythonrun.h Lib/__future__.py Lib/opcode.py Objects/object.c Python/ceval.c Python/compile.c Python/future.c
by thomas.wouters Feb. 26, 2007

Feb. 26, 2007

Author: thomas.wouters Date: Mon Feb 26 21:27:03 2007 New Revision: 53958 Modified: python/branches/twouters-dictviews-backport/Include/code.h python/branches/twouters-dictviews-backport/Include/compile.h python/branches/twouters-dictviews-backport/Include/object.h python/branches/twouters-dictviews-backport/Include/opcode.h python/branches/twouters-dictviews-backport/Include/pythonrun.h python/branches/twouters-dictviews-backport/Lib/__future__.py python/branches/twouters-dictviews-backport/Lib/opcode.py python/branches/twouters-dictviews-backport/Objects/object.c python/branches/twouters-dictviews-backport/Python/ceval.c python/branches/twouters-dictviews-backport/Python/compile.c python/branches/twouters-dictviews-backport/Python/future.c Log: Future statement for d.keys() to return a keys view (and similar for items and values.) Works by specialcasing dicts (and subclasses), but dict-alikes (even those with both 'keys' and 'viewkeys' attributes) won't feel the magic; they don't automatically get it in Python 3.0 either. Still to do: fixing getattr() to do the same thing. Modified: python/branches/twouters-dictviews-backport/Include/code.h ============================================================================== --- python/branches/twouters-dictviews-backport/Include/code.h (original) +++ python/branches/twouters-dictviews-backport/Include/code.h Mon Feb 26 21:27:03 2007 @@ -48,6 +48,7 @@ #define CO_FUTURE_DIVISION 0x2000 #define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */ #define CO_FUTURE_WITH_STATEMENT 0x8000 +#define CO_FUTURE_DICTVIEWS 0x10000 /* This should be defined if a future statement modifies the syntax. For example, when a keyword is added. Modified: python/branches/twouters-dictviews-backport/Include/compile.h ============================================================================== --- python/branches/twouters-dictviews-backport/Include/compile.h (original) +++ python/branches/twouters-dictviews-backport/Include/compile.h Mon Feb 26 21:27:03 2007 @@ -24,6 +24,7 @@ #define FUTURE_DIVISION "division" #define FUTURE_ABSOLUTE_IMPORT "absolute_import" #define FUTURE_WITH_STATEMENT "with_statement" +#define FUTURE_DICTVIEWS "dictviews" struct _mod; /* Declare the existence of this type */ PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *, Modified: python/branches/twouters-dictviews-backport/Include/object.h ============================================================================== --- python/branches/twouters-dictviews-backport/Include/object.h (original) +++ python/branches/twouters-dictviews-backport/Include/object.h Mon Feb 26 21:27:03 2007 @@ -402,7 +402,9 @@ PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *); PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) _PyObject_GetViewAttr(PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); +PyAPI_FUNC(int) _PyObject_SetViewAttr(PyObject *, PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); Modified: python/branches/twouters-dictviews-backport/Include/opcode.h ============================================================================== --- python/branches/twouters-dictviews-backport/Include/opcode.h (original) +++ python/branches/twouters-dictviews-backport/Include/opcode.h Mon Feb 26 21:27:03 2007 @@ -103,12 +103,13 @@ #define COMPARE_OP 106 /* Comparison operator */ #define IMPORT_NAME 107 /* Index in name list */ #define IMPORT_FROM 108 /* Index in name list */ - +#define LOAD_VIEWATTR 109 /* Index in name list */ #define JUMP_FORWARD 110 /* Number of bytes to skip */ #define JUMP_IF_FALSE 111 /* "" */ #define JUMP_IF_TRUE 112 /* "" */ #define JUMP_ABSOLUTE 113 /* Target byte offset from beginning of code */ - +#define STORE_VIEWATTR 114 /* Index in name list */ +#define DELETE_VIEWATTR 115 /* Index in name list */ #define LOAD_GLOBAL 116 /* Index in name list */ #define CONTINUE_LOOP 119 /* Start of loop (absolute) */ Modified: python/branches/twouters-dictviews-backport/Include/pythonrun.h ============================================================================== --- python/branches/twouters-dictviews-backport/Include/pythonrun.h (original) +++ python/branches/twouters-dictviews-backport/Include/pythonrun.h Mon Feb 26 21:27:03 2007 @@ -8,7 +8,7 @@ #endif #define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ - CO_FUTURE_WITH_STATEMENT) + CO_FUTURE_WITH_STATEMENT | CO_FUTURE_DICTVIEWS) #define PyCF_MASK_OBSOLETE (CO_NESTED) #define PyCF_SOURCE_IS_UTF8 0x0100 #define PyCF_DONT_IMPLY_DEDENT 0x0200 Modified: python/branches/twouters-dictviews-backport/Lib/__future__.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/__future__.py (original) +++ python/branches/twouters-dictviews-backport/Lib/__future__.py Mon Feb 26 21:27:03 2007 @@ -66,6 +66,7 @@ CO_FUTURE_DIVISION = 0x2000 # division CO_FUTURE_ABSOLUTE_IMPORT = 0x4000 # perform absolute imports by default CO_FUTURE_WITH_STATEMENT = 0x8000 # with statement +CO_FUTURE_DICTVIEWS = 0x10000 class _Feature: def __init__(self, optionalRelease, mandatoryRelease, compiler_flag): @@ -114,3 +115,7 @@ with_statement = _Feature((2, 5, 0, "alpha", 1), (2, 6, 0, "alpha", 0), CO_FUTURE_WITH_STATEMENT) + +dictviews = _Feature((2, 6, 0, "alpha", 1), + (3, 0, 0, "alpha", 0), + CO_FUTURE_DICTVIEWS) Modified: python/branches/twouters-dictviews-backport/Lib/opcode.py ============================================================================== --- python/branches/twouters-dictviews-backport/Lib/opcode.py (original) +++ python/branches/twouters-dictviews-backport/Lib/opcode.py Mon Feb 26 21:27:03 2007 @@ -144,12 +144,13 @@ hascompare.append(106) name_op('IMPORT_NAME', 107) # Index in name list name_op('IMPORT_FROM', 108) # Index in name list - +name_op('LOAD_VIEWATTR', 109) # Index in name list jrel_op('JUMP_FORWARD', 110) # Number of bytes to skip jrel_op('JUMP_IF_FALSE', 111) # "" jrel_op('JUMP_IF_TRUE', 112) # "" jabs_op('JUMP_ABSOLUTE', 113) # Target byte offset from beginning of code - +name_op('STORE_VIEWATTR', 114) # Index in name list +name_op('DELETE_VIEWATTR', 115) # Index in name list name_op('LOAD_GLOBAL', 116) # Index in name list jabs_op('CONTINUE_LOOP', 119) # Target address Modified: python/branches/twouters-dictviews-backport/Objects/object.c ============================================================================== --- python/branches/twouters-dictviews-backport/Objects/object.c (original) +++ python/branches/twouters-dictviews-backport/Objects/object.c Mon Feb 26 21:27:03 2007 @@ -1100,6 +1100,33 @@ } PyObject * +_PyObject_GetViewAttr(PyObject *v, PyObject *name) +{ + /* Wrapper around PyObject_GetAttr that translates + dict.keys/items/values into dict.viewkeys/viewitems/viewvalues + for all subclasses of dict. It doesn't care about dict-like + objects even if they have view* attrs, and doesn't check + whether the attribute is actually one of keys/items/values */ + if (PyDict_Check(v)) { + static PyObject *viewstr; + PyObject *result; + + if (viewstr == NULL) { + viewstr = PyString_InternFromString("view"); + if (viewstr == NULL) + return NULL; + } + name = PyNumber_Add(viewstr, name); + if (name == NULL) + return NULL; + result = PyObject_GetAttr(v, name); + Py_DECREF(name); + return result; + } + return PyObject_GetAttr(v, name); +} + +PyObject * PyObject_GetAttr(PyObject *v, PyObject *name) { PyTypeObject *tp = v->ob_type; @@ -1146,6 +1173,29 @@ } int +_PyObject_SetViewAttr(PyObject *v, PyObject *name, PyObject *value) +{ + /* Like _PyObject_GetViewAttr(), but for setting/deleting */ + if (PyDict_Check(v)) { + static PyObject *viewstr; + int result; + + if (viewstr == NULL) { + viewstr = PyString_InternFromString("view"); + if (viewstr == NULL) + return -1; + } + name = PyNumber_Add(viewstr, name); + if (name == NULL) + return -1; + result = PyObject_SetAttr(v, name, value); + Py_DECREF(name); + return result; + } + return PyObject_SetAttr(v, name, value); +} + +int PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value) { PyTypeObject *tp = v->ob_type; Modified: python/branches/twouters-dictviews-backport/Python/ceval.c ============================================================================== --- python/branches/twouters-dictviews-backport/Python/ceval.c (original) +++ python/branches/twouters-dictviews-backport/Python/ceval.c Mon Feb 26 21:27:03 2007 @@ -1796,6 +1796,17 @@ if (err == 0) continue; break; + case STORE_VIEWATTR: + w = GETITEM(names, oparg); + v = TOP(); + u = SECOND(); + STACKADJ(-2); + err = _PyObject_SetViewAttr(v, w, u); /* v.w = u */ + Py_DECREF(v); + Py_DECREF(u); + if (err == 0) continue; + break; + case DELETE_ATTR: w = GETITEM(names, oparg); v = POP(); @@ -1804,6 +1815,13 @@ Py_DECREF(v); break; + case DELETE_VIEWATTR: + w = GETITEM(names, oparg); + v = POP(); + err = _PyObject_SetViewAttr(v, w, (PyObject *)NULL); + Py_DECREF(v); + break; + case STORE_GLOBAL: w = GETITEM(names, oparg); v = POP(); @@ -2003,6 +2021,16 @@ if (x != NULL) continue; break; + case LOAD_VIEWATTR: + w = GETITEM(names, oparg); + v = TOP(); + x = _PyObject_GetViewAttr(v, w); + Py_DECREF(v); + SET_TOP(x); + if (x != NULL) + continue; + break; + case COMPARE_OP: w = POP(); v = TOP(); Modified: python/branches/twouters-dictviews-backport/Python/compile.c ============================================================================== --- python/branches/twouters-dictviews-backport/Python/compile.c (original) +++ python/branches/twouters-dictviews-backport/Python/compile.c Mon Feb 26 21:27:03 2007 @@ -155,6 +155,7 @@ static basicblock *compiler_use_new_block(struct compiler *); static int compiler_error(struct compiler *, const char *); static int compiler_nameop(struct compiler *, identifier, expr_context_ty); +static int compiler_attrop(struct compiler *, expr_ty); static PyCodeObject *compiler_mod(struct compiler *, mod_ty); static int compiler_visit_stmt(struct compiler *, stmt_ty); @@ -781,8 +782,10 @@ return 1; case STORE_ATTR: + case STORE_VIEWATTR: return -2; case DELETE_ATTR: + case DELETE_VIEWATTR: return -1; case STORE_GLOBAL: return -1; @@ -800,6 +803,7 @@ case BUILD_MAP: return 1; case LOAD_ATTR: + case LOAD_VIEWATTR: return 0; case COMPARE_OP: return -1; @@ -2942,31 +2946,7 @@ break; /* The following exprs can be assignment targets. */ case Attribute_kind: - if (e->v.Attribute.ctx != AugStore) - VISIT(c, expr, e->v.Attribute.value); - switch (e->v.Attribute.ctx) { - case AugLoad: - ADDOP(c, DUP_TOP); - /* Fall through to load */ - case Load: - ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names); - break; - case AugStore: - ADDOP(c, ROT_TWO); - /* Fall through to save */ - case Store: - ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names); - break; - case Del: - ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names); - break; - case Param: - default: - PyErr_SetString(PyExc_SystemError, - "param invalid in attribute expression"); - return 0; - } - break; + return compiler_attrop(c, e); case Subscript_kind: switch (e->v.Subscript.ctx) { case AugLoad: @@ -3052,6 +3032,50 @@ return 1; } + /* Helper to handle dictviews future-import magic */ +static int +compiler_attrop(struct compiler *c, expr_ty e) +{ + int needviews = 0; + + if (c->c_flags && (c->c_flags->cf_flags & CO_FUTURE_DICTVIEWS)) { + const char *attrstr = PyString_AS_STRING(e->v.Attribute.attr); + if (strcmp(attrstr, "keys") == 0 || + strcmp(attrstr, "items") == 0 || + strcmp(attrstr, "values") == 0) + needviews = 1; + } + + if (e->v.Attribute.ctx != AugStore) + VISIT(c, expr, e->v.Attribute.value); + switch (e->v.Attribute.ctx) { + case AugLoad: + ADDOP(c, DUP_TOP); + /* Fall through to load */ + case Load: + ADDOP_NAME(c, needviews ? LOAD_VIEWATTR : LOAD_ATTR, + e->v.Attribute.attr, names); + break; + case AugStore: + ADDOP(c, ROT_TWO); + /* Fall through to save */ + case Store: + ADDOP_NAME(c, needviews ? STORE_VIEWATTR : STORE_ATTR, + e->v.Attribute.attr, names); + break; + case Del: + ADDOP_NAME(c, needviews ? DELETE_VIEWATTR : DELETE_ATTR, + e->v.Attribute.attr, names); + break; + case Param: + default: + PyErr_SetString(PyExc_SystemError, + "param invalid in attribute expression"); + return 0; + } + return 1; +} + static int compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b) { Modified: python/branches/twouters-dictviews-backport/Python/future.c ============================================================================== --- python/branches/twouters-dictviews-backport/Python/future.c (original) +++ python/branches/twouters-dictviews-backport/Python/future.c Mon Feb 26 21:27:03 2007 @@ -33,6 +33,8 @@ ff->ff_features |= CO_FUTURE_ABSOLUTE_IMPORT; } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) { ff->ff_features |= CO_FUTURE_WITH_STATEMENT; + } else if (strcmp(feature, FUTURE_DICTVIEWS) == 0) { + ff->ff_features |= CO_FUTURE_DICTVIEWS; } else if (strcmp(feature, "braces") == 0) { PyErr_SetString(PyExc_SyntaxError, "not a chance");

1 0

buildbot warnings in x86 XP trunk
by buildbot＠python.org Feb. 26, 2007

Feb. 26, 2007

The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP%2520trunk/builds/219 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: jeremy.hylton Build had warnings: warnings failed slave lost sincerely, -The Buildbot

1 0

buildbot warnings in alpha Tru64 5.1 trunk
by buildbot＠python.org Feb. 26, 2007

Feb. 26, 2007

The Buildbot has detected a new failure of alpha Tru64 5.1 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Tru64%25205.1%2520trunk/bu… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: jeremy.hylton Build had warnings: warnings test Excerpt from the test logfile: sincerely, -The Buildbot

1 0