Mailman 3 March 2004 - Python-checkins

python/dist/src/Lib/test test_marshal.py,1.5,1.6
by arigo＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16157/Lib/test Modified Files: test_marshal.py Log Message: Marshal clean-up (SF patch #873224) Index: test_marshal.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_marshal.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_marshal.py 18 Jan 2004 20:29:55 -0000 1.5 --- test_marshal.py 26 Mar 2004 15:09:27 -0000 1.6 *************** *** 176,179 **** --- 176,184 ---- marshal.dumps([128] * 1000) + def test_patch_873224(self): + self.assertRaises(Exception, marshal.loads, '0') + self.assertRaises(Exception, marshal.loads, 'f') + self.assertRaises(Exception, marshal.loads, marshal.dumps(5L)[:-1]) + def test_main(): test_support.run_unittest(IntTestCase,

1 0

python/dist/src/Python import.c, 2.228, 2.229 marshal.c, 1.75, 1.76
by arigo＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16157/Python Modified Files: import.c marshal.c Log Message: Marshal clean-up (SF patch #873224) Index: import.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/import.c,v retrieving revision 2.228 retrieving revision 2.229 diff -C2 -d -r2.228 -r2.229 *** import.c 24 Mar 2004 22:22:12 -0000 2.228 --- import.c 26 Mar 2004 15:09:27 -0000 2.229 *************** *** 707,716 **** co = PyMarshal_ReadLastObjectFromFile(fp); ! /* Ugly: rd_object() may return NULL with or without error */ ! if (co == NULL || !PyCode_Check(co)) { ! if (!PyErr_Occurred()) ! PyErr_Format(PyExc_ImportError, ! "Non-code object in %.200s", cpathname); ! Py_XDECREF(co); return NULL; } --- 707,716 ---- co = PyMarshal_ReadLastObjectFromFile(fp); ! if (co == NULL) ! return NULL; ! if (!PyCode_Check(co)) { ! PyErr_Format(PyExc_ImportError, ! "Non-code object in %.200s", cpathname); ! Py_DECREF(co); return NULL; } *************** *** 820,824 **** PyMarshal_WriteLongToFile(0L, fp); PyMarshal_WriteObjectToFile((PyObject *)co, fp); ! if (ferror(fp)) { if (Py_VerboseFlag) PySys_WriteStderr("# can't write %s\n", cpathname); --- 820,824 ---- PyMarshal_WriteLongToFile(0L, fp); PyMarshal_WriteObjectToFile((PyObject *)co, fp); ! if (fflush(fp) != 0 || ferror(fp)) { if (Py_VerboseFlag) PySys_WriteStderr("# can't write %s\n", cpathname); Index: marshal.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** marshal.c 4 Sep 2003 11:59:50 -0000 1.75 --- marshal.c 26 Mar 2004 15:09:27 -0000 1.76 *************** *** 381,384 **** --- 381,386 ---- r_object(RFILE *p) { + /* NULL is a valid return value, it does not necessarily means that + an exception is set. */ PyObject *v, *v2; long i, n; *************** *** 431,436 **** return NULL; ob->ob_size = n; ! for (i = 0; i < size; i++) ! ob->ob_digit[i] = r_short(p); return (PyObject *)ob; } --- 433,446 ---- return NULL; ob->ob_size = n; ! for (i = 0; i < size; i++) { ! int digit = r_short(p); ! if (digit < 0) { ! Py_DECREF(ob); ! PyErr_SetString(PyExc_ValueError, ! "bad marshal data"); ! return NULL; ! } ! ob->ob_digit[i] = digit; ! } return (PyObject *)ob; } *************** *** 441,445 **** double dx; n = r_byte(p); ! if (r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); --- 451,455 ---- double dx; n = r_byte(p); ! if (n == EOF || r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); *************** *** 459,463 **** Py_complex c; n = r_byte(p); ! if (r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); --- 469,473 ---- Py_complex c; n = r_byte(p); ! if (n == EOF || r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); *************** *** 469,473 **** PyFPE_END_PROTECT(c) n = r_byte(p); ! if (r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); --- 479,483 ---- PyFPE_END_PROTECT(c) n = r_byte(p); ! if (n == EOF || r_string(buf, (int)n, p) != n) { PyErr_SetString(PyExc_EOFError, "EOF read where object expected"); *************** *** 536,539 **** --- 546,552 ---- v2 = r_object(p); if ( v2 == NULL ) { + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_TypeError, + "NULL object in marshal data"); Py_DECREF(v); v = NULL; *************** *** 556,559 **** --- 569,575 ---- v2 = r_object(p); if ( v2 == NULL ) { + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_TypeError, + "NULL object in marshal data"); Py_DECREF(v); v = NULL; *************** *** 572,576 **** key = r_object(p); if (key == NULL) ! break; /* XXX Assume TYPE_NULL, not an error */ val = r_object(p); if (val != NULL) --- 588,592 ---- key = r_object(p); if (key == NULL) ! break; val = r_object(p); if (val != NULL) *************** *** 579,582 **** --- 595,602 ---- Py_XDECREF(val); } + if (PyErr_Occurred()) { + Py_DECREF(v); + v = NULL; + } return v; *************** *** 593,619 **** int stacksize = r_long(p); int flags = r_long(p); ! PyObject *code = NULL; ! PyObject *consts = NULL; ! PyObject *names = NULL; ! PyObject *varnames = NULL; ! PyObject *freevars = NULL; ! PyObject *cellvars = NULL; ! PyObject *filename = NULL; ! PyObject *name = NULL; ! int firstlineno = 0; ! PyObject *lnotab = NULL; ! ! code = r_object(p); ! if (code) consts = r_object(p); ! if (consts) names = r_object(p); ! if (names) varnames = r_object(p); ! if (varnames) freevars = r_object(p); ! if (freevars) cellvars = r_object(p); ! if (cellvars) filename = r_object(p); ! if (filename) name = r_object(p); ! if (name) { ! firstlineno = r_long(p); ! lnotab = r_object(p); ! } if (!PyErr_Occurred()) { --- 613,626 ---- int stacksize = r_long(p); int flags = r_long(p); ! PyObject *code = r_object(p); ! PyObject *consts = r_object(p); ! PyObject *names = r_object(p); ! PyObject *varnames = r_object(p); ! PyObject *freevars = r_object(p); ! PyObject *cellvars = r_object(p); ! PyObject *filename = r_object(p); ! PyObject *name = r_object(p); ! int firstlineno = r_long(p); ! PyObject *lnotab = r_object(p); if (!PyErr_Occurred()) { *************** *** 648,651 **** --- 655,672 ---- } + PyObject * + read_object(RFILE *p) + { + PyObject *v; + if (PyErr_Occurred()) { + fprintf(stderr, "XXX readobject called with exception set\n"); + return NULL; + } + v = r_object(p); + if (v == NULL && !PyErr_Occurred()) + PyErr_SetString(PyExc_TypeError, "NULL object in marshal data"); + return v; + } + int PyMarshal_ReadShortFromFile(FILE *fp) *************** *** 694,701 **** off_t filesize; #endif - if (PyErr_Occurred()) { - fprintf(stderr, "XXX rd_object called with exception set\n"); - return NULL; - } #ifdef HAVE_FSTAT filesize = getfilesize(fp); --- 715,718 ---- *************** *** 731,740 **** { RFILE rf; - if (PyErr_Occurred()) { - fprintf(stderr, "XXX rd_object called with exception set\n"); - return NULL; - } rf.fp = fp; ! return r_object(&rf); } --- 748,753 ---- { RFILE rf; rf.fp = fp; ! return read_object(&rf); } *************** *** 743,755 **** { RFILE rf; - if (PyErr_Occurred()) { - fprintf(stderr, "XXX rds_object called with exception set\n"); - return NULL; - } rf.fp = NULL; - rf.str = NULL; rf.ptr = str; rf.end = str + len; ! return r_object(&rf); } --- 756,763 ---- { RFILE rf; rf.fp = NULL; rf.ptr = str; rf.end = str + len; ! return read_object(&rf); } *************** *** 817,821 **** RFILE rf; PyObject *f; - PyObject *v; if (!PyArg_ParseTuple(args, "O:load", &f)) return NULL; --- 825,828 ---- *************** *** 826,838 **** } rf.fp = PyFile_AsFile(f); ! rf.str = NULL; ! rf.ptr = rf.end = NULL; ! PyErr_Clear(); ! v = r_object(&rf); ! if (PyErr_Occurred()) { ! Py_XDECREF(v); ! v = NULL; ! } ! return v; } --- 833,837 ---- } rf.fp = PyFile_AsFile(f); ! return read_object(&rf); } *************** *** 850,854 **** { RFILE rf; - PyObject *v; char *s; int n; --- 849,852 ---- *************** *** 856,869 **** return NULL; rf.fp = NULL; - rf.str = args; rf.ptr = s; rf.end = s + n; ! PyErr_Clear(); ! v = r_object(&rf); ! if (PyErr_Occurred()) { ! Py_XDECREF(v); ! v = NULL; ! } ! return v; } --- 854,860 ---- return NULL; rf.fp = NULL; rf.ptr = s; rf.end = s + n; ! return read_object(&rf); }

1 0

python/nondist/sandbox/string __init__.py, NONE, 1.1 string.py, NONE, 1.1 pep292.py, NONE, 1.1 safedict.py, NONE, 1.1
by bcannon＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/string In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14961/string Added Files: __init__.py string.py pep292.py safedict.py Log Message: Initial go at a PEP 292 implementation. 'string' module in check-in is a straight copy from Lib in order to make imports work without any hassle. --- NEW FILE: __init__.py --- # Copyright (C) 2004 Python Software Foundation # Author: barry(a)python.org (Barry Warsaw) __version__ = '1.0' # __all__ either needs to be left out for blanket importation or needs to have # something like ``__all__.extend([stuff # for stuff from dir(sys.modules['string']) # if not stuff.startswith('_')])`` #__all__ = [ # 'dstring', 'astring', # 'safedict', 'nsdict', # ] from pep292 import dstring, astring from safedict import safedict, nsdict from string import * --- NEW FILE: string.py --- """A collection of string operations (most are no longer used). Warning: most of the code you see here isn't normally used nowadays. Beginning with Python 1.6, many of these functions are implemented as methods on the standard string object. They used to be implemented by a built-in module called strop, but strop is now obsolete itself. Public module variables: whitespace -- a string containing all characters considered whitespace lowercase -- a string containing all characters considered lowercase letters uppercase -- a string containing all characters considered uppercase letters letters -- a string containing all characters considered letters digits -- a string containing all characters considered decimal digits hexdigits -- a string containing all characters considered hexadecimal digits octdigits -- a string containing all characters considered octal digits punctuation -- a string containing all characters considered punctuation printable -- a string containing all characters considered printable """ # Some strings for ctype-style character classification whitespace = ' \t\n\r\v\f' lowercase = 'abcdefghijklmnopqrstuvwxyz' uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' letters = lowercase + uppercase ascii_lowercase = lowercase ascii_uppercase = uppercase ascii_letters = ascii_lowercase + ascii_uppercase digits = '0123456789' hexdigits = digits + 'abcdef' + 'ABCDEF' octdigits = '01234567' punctuation = """!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" printable = digits + letters + punctuation + whitespace # Case conversion helpers # Use str to convert Unicode literal in case of -U l = map(chr, xrange(256)) _idmap = str('').join(l) del l # Backward compatible names for exceptions index_error = ValueError atoi_error = ValueError atof_error = ValueError atol_error = ValueError # convert UPPER CASE letters to lower case def lower(s): """lower(s) -> string Return a copy of the string s converted to lowercase. """ return s.lower() # Convert lower case letters to UPPER CASE def upper(s): """upper(s) -> string Return a copy of the string s converted to uppercase. """ return s.upper() # Swap lower case letters and UPPER CASE def swapcase(s): """swapcase(s) -> string Return a copy of the string s with upper case characters converted to lowercase and vice versa. """ return s.swapcase() # Strip leading and trailing tabs and spaces def strip(s, chars=None): """strip(s [,chars]) -> string Return a copy of the string s with leading and trailing whitespace removed. If chars is given and not None, remove characters in chars instead. If chars is unicode, S will be converted to unicode before stripping. """ return s.strip(chars) # Strip leading tabs and spaces def lstrip(s, chars=None): """lstrip(s [,chars]) -> string Return a copy of the string s with leading whitespace removed. If chars is given and not None, remove characters in chars instead. """ return s.lstrip(chars) # Strip trailing tabs and spaces def rstrip(s, chars=None): """rstrip(s [,chars]) -> string Return a copy of the string s with trailing whitespace removed. If chars is given and not None, remove characters in chars instead. """ return s.rstrip(chars) # Split a string into a list of space/tab-separated words def split(s, sep=None, maxsplit=-1): """split(s [,sep [,maxsplit]]) -> list of strings Return a list of the words in the string s, using sep as the delimiter string. If maxsplit is given, splits at no more than maxsplit places (resulting in at most maxsplit+1 words). If sep is not specified, any whitespace string is a separator. (split and splitfields are synonymous) """ return s.split(sep, maxsplit) splitfields = split # Split a string into a list of space/tab-separated words def rsplit(s, sep=None, maxsplit=-1): """rsplit(s [,sep [,maxsplit]]) -> list of strings Return a list of the words in the string s, using sep as the delimiter string, starting at the end of the string and working to the front. If maxsplit is given, at most maxsplit splits are done. If sep is not specified or is None, any whitespace string is a separator. """ return s.rsplit(sep, maxsplit) # Join fields with optional separator def join(words, sep = ' '): """join(list [,sep]) -> string Return a string composed of the words in list, with intervening occurrences of sep. The default separator is a single space. (joinfields and join are synonymous) """ return sep.join(words) joinfields = join # Find substring, raise exception if not found def index(s, *args): """index(s, sub [,start [,end]]) -> int Like find but raises ValueError when the substring is not found. """ return s.index(*args) # Find last substring, raise exception if not found def rindex(s, *args): """rindex(s, sub [,start [,end]]) -> int Like rfind but raises ValueError when the substring is not found. """ return s.rindex(*args) # Count non-overlapping occurrences of substring def count(s, *args): """count(s, sub[, start[,end]]) -> int Return the number of occurrences of substring sub in string s[start:end]. Optional arguments start and end are interpreted as in slice notation. """ return s.count(*args) # Find substring, return -1 if not found def find(s, *args): """find(s, sub [,start [,end]]) -> in Return the lowest index in s where substring sub is found, such that sub is contained within s[start,end]. Optional arguments start and end are interpreted as in slice notation. Return -1 on failure. """ return s.find(*args) # Find last substring, return -1 if not found def rfind(s, *args): """rfind(s, sub [,start [,end]]) -> int Return the highest index in s where substring sub is found, such that sub is contained within s[start,end]. Optional arguments start and end are interpreted as in slice notation. Return -1 on failure. """ return s.rfind(*args) # for a bit of speed _float = float _int = int _long = long # Convert string to float def atof(s): """atof(s) -> float Return the floating point number represented by the string s. """ return _float(s) # Convert string to integer def atoi(s , base=10): """atoi(s [,base]) -> int Return the integer represented by the string s in the given base, which defaults to 10. The string s must consist of one or more digits, possibly preceded by a sign. If base is 0, it is chosen from the leading characters of s, 0 for octal, 0x or 0X for hexadecimal. If base is 16, a preceding 0x or 0X is accepted. """ return _int(s, base) # Convert string to long integer def atol(s, base=10): """atol(s [,base]) -> long Return the long integer represented by the string s in the given base, which defaults to 10. The string s must consist of one or more digits, possibly preceded by a sign. If base is 0, it is chosen from the leading characters of s, 0 for octal, 0x or 0X for hexadecimal. If base is 16, a preceding 0x or 0X is accepted. A trailing L or l is not accepted, unless base is 0. """ return _long(s, base) # Left-justify a string def ljust(s, width, *args): """ljust(s, width[, fillchar]) -> string Return a left-justified version of s, in a field of the specified width, padded with spaces as needed. The string is never truncated. If specified the fillchar is used instead of spaces. """ return s.ljust(width, *args) # Right-justify a string def rjust(s, width, *args): """rjust(s, width[, fillchar]) -> string Return a right-justified version of s, in a field of the specified width, padded with spaces as needed. The string is never truncated. If specified the fillchar is used instead of spaces. """ return s.rjust(width, *args) # Center a string def center(s, width, *args): """center(s, width[, fillchar]) -> string Return a center version of s, in a field of the specified width. padded with spaces as needed. The string is never truncated. If specified the fillchar is used instead of spaces. """ return s.center(width, *args) # Zero-fill a number, e.g., (12, 3) --> '012' and (-3, 3) --> '-03' # Decadent feature: the argument may be a string or a number # (Use of this is deprecated; it should be a string as with ljust c.s.) def zfill(x, width): """zfill(x, width) -> string Pad a numeric string x with zeros on the left, to fill a field of the specified width. The string x is never truncated. """ if not isinstance(x, basestring): x = repr(x) return x.zfill(width) # Expand tabs in a string. # Doesn't take non-printing chars into account, but does understand \n. def expandtabs(s, tabsize=8): """expandtabs(s [,tabsize]) -> string Return a copy of the string s with all tab characters replaced by the appropriate number of spaces, depending on the current column, and the tabsize (default 8). """ return s.expandtabs(tabsize) # Character translation through look-up table. def translate(s, table, deletions=""): """translate(s,table [,deletions]) -> string Return a copy of the string s, where all characters occurring in the optional argument deletions are removed, and the remaining characters have been mapped through the given translation table, which must be a string of length 256. The deletions argument is not allowed for Unicode strings. """ if deletions: return s.translate(table, deletions) else: # Add s[:0] so that if s is Unicode and table is an 8-bit string, # table is converted to Unicode. This means that table *cannot* # be a dictionary -- for that feature, use u.translate() directly. return s.translate(table + s[:0]) # Capitalize a string, e.g. "aBc dEf" -> "Abc def". def capitalize(s): """capitalize(s) -> string Return a copy of the string s with only its first character capitalized. """ return s.capitalize() # Capitalize the words in a string, e.g. " aBc dEf " -> "Abc Def". # See also regsub.capwords(). def capwords(s, sep=None): """capwords(s, [sep]) -> string Split the argument into words using split, capitalize each word using capitalize, and join the capitalized words using join. Note that this replaces runs of whitespace characters by a single space. """ return join(map(capitalize, s.split(sep)), sep or ' ') # Construct a translation string _idmapL = None def maketrans(fromstr, tostr): """maketrans(frm, to) -> string Return a translation table (a string of 256 bytes long) suitable for use in string.translate. The strings frm and to must be of the same length. """ if len(fromstr) != len(tostr): raise ValueError, "maketrans arguments must have same length" global _idmapL if not _idmapL: _idmapL = map(None, _idmap) L = _idmapL[:] fromstr = map(ord, fromstr) for i in range(len(fromstr)): L[fromstr[i]] = tostr[i] return join(L, "") # Substring replacement (global) def replace(s, old, new, maxsplit=-1): """replace (str, old, new[, maxsplit]) -> string Return a copy of string str with all occurrences of substring old replaced by new. If the optional argument maxsplit is given, only the first maxsplit occurrences are replaced. """ return s.replace(old, new, maxsplit) # Try importing optional built-in module "strop" -- if it exists, # it redefines some string operations that are 100-1000 times faster. # It also defines values for whitespace, lowercase and uppercase # that match <ctype.h>'s definitions. try: from strop import maketrans, lowercase, uppercase, whitespace letters = lowercase + uppercase except ImportError: pass # Use the original versions --- NEW FILE: pep292.py --- # Copyright (C) 2004 Python Software Foundation # Author: barry(a)python.org (Barry Warsaw) """A package supporting PEP 292 Simple String Substitutions. See http://www.python.org/peps/pep-0292.html for full specification. Two subclasses of the unicode type are provided: dstring - PEP 292 'dollar' strings with the following substitution rules: 1. $$ is an escape; it is replaced with a single $ 2. $identifier names a substitution placeholder matching a mapping key of "identifier". "identifier" must be a Python identifier as defined in [2]. The first non-identifier character after the $ character terminates this placeholder specification. 3. ${identifier} is equivalent to $identifier. It is required for when valid identifier characters follow the placeholder but are not part of the placeholder, e.g. "${noun}ification". No other characters have special meaning. [2] Identifiers and Keywords http://www.python.org/doc/current/ref/identifiers.html astring - like dstring, but allows dotted identifiers (i.e. attribute paths) as the substitution variables. You can also derive your own classes from dstring to define different identifier rules. UTSL for details. Examples: >>> x = dstring('$who owes me $what') >>> print x $who owes me $what >>> print x % {'who': 'Tim', 'what': 'a bag of ham'} Tim owes me a bag of ham >>> import re >>> class mstring(dstring): ... cre = re.compile( ... r'(\${2})|\$(mm:[_a-z]\w*)|\$({mm:[_a-z]\w*})', re.IGNORECASE) ... >>> x = mstring('$who owes me $mm:what') >>> print x % {'who': 'Tim', 'mm:what', 'nothing'} $who owes me nothing """ __all__ = ['dstring', 'astring'] import re # Search for $$, $identifier, or ${identifier} dre = re.compile(r'(\${2})|\$([_a-z][_a-z0-9]*)|\$({[_a-z][_a-z0-9]*})', re.IGNORECASE) # Like dre, but allows dots after the first character are = re.compile(r'(\${2})|\$([_a-z][_.a-z0-9]*)|\$({[_a-z][_.a-z0-9]*})', re.IGNORECASE) EMPTYSTRING = '' class dstring(unicode): cre = dre """A string class for supporting $-substitutions.""" def __init__(self, s, *args, **kws): s = s.replace('%', '%%') parts = self.cre.split(s) # Here's what the elements of parts looks like after the split: # # 0 - any text before the first match # i, i+1, i+2 - groups of 3 corresponding to the three capturing # parentheses in the regular expression. Only one of these # three will not be None, since of course only one group will # match. # i+3 - this will be all the non-matching text between this match and # the next one, or the end of the string if this is the last # match. # # The algorithm then is to figure out which of the three groups # matched, and replace it with the %()s equivalent syntax. for i in range(1, len(parts), 4): if parts[i] is not None: # This matched the escape pattern. It can just be replaced # with a single dollar since that's not special to Python's # build-in string interpolation. parts[i] = '$' elif parts[i+1] is not None: # This matched $identifier. The $ is not retained in the # capturing parenthesis group. parts[i+1] = '%(' + parts[i+1] + ')s' else: # This matched ${identifier}. The $ is not retained in the # capturing parenthesis group, but the curly braces are. # Doing so is useful for the safedict. parts[i+2] = '%(' + parts[i+2] + ')s' # Cache Pythonically syntaxed substitution string self._modstr = EMPTYSTRING.join(filter(None, parts)) super(unicode, self).__init__(s, *args, **kws) def __mod__(self, other): return self._modstr % other class astring(dstring): """Like string, but allow for dotted attribute paths.""" cre = are --- NEW FILE: safedict.py --- # Copyright (C) 2004 Python Software Foundation # Author: barry(a)python.org (Barry Warsaw) """Substitution dictionaries. These work with $-string to provide foolproof substitutions. """ import sys _missing = object() class safedict(dict): """Dictionary which returns a default value for unknown keys.""" def __getitem__(self, key): if key.startswith('{') and key.endswith('}'): key = key[1:-1] fmt = '${%s}' else: fmt = '$%s' try: return super(safedict, self).__getitem__(key) except KeyError: return fmt % key class nsdict(dict): startframe = 1 """Dictionary which substitutes in locals and globals.""" def __getitem__(self, key): if key.startswith('{') and key.endswith('}'): key = key[1:-1] fmt = '${%s}' else: fmt = '$%s' # Split the key as if it were an attribute path parts = key.split('.') part0 = parts.pop(0) # Now search for the parts, starting with the locals and then trying # the globals, in the frame one call site up. _getframe(0) would be # nsdict.__getitem__(). You can start in different frame locations by # deriving from this class and overriding startframe. The default is # to start at our caller. frame = sys._getframe(self.startframe) if frame.f_locals.has_key(part0): obj = frame.f_locals[part0] elif frame.f_globals.has_key(part0): obj = frame.f_globals[part0] else: return fmt % key while parts: attr = parts.pop(0) obj = getattr(obj, attr, _missing) if obj is _missing: return fmt % key return obj

1 0

python/nondist/sandbox/string - New directory
by bcannon＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/nondist/sandbox/string In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/string Log Message: Directory /cvsroot/python/python/nondist/sandbox/string added to the repository

1 0

python/dist/src/Lib sre_compile.py,1.51,1.52
by rhettinger＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32139 Modified Files: sre_compile.py Log Message: Simple optimizations: * pre-build a single identity function for the fixup function * pre-build membership tests in dictionaries instead of in-line tuples * assign len() to a local variable * assign append() methods to a local variable * use xrange() instead of range() * replace "x<<1" with "x+x" Index: sre_compile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/sre_compile.py,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** sre_compile.py 25 Mar 2004 13:50:59 -0000 1.51 --- sre_compile.py 26 Mar 2004 11:16:55 -0000 1.52 *************** *** 22,30 **** MAXCODE = 0xFFFFFFFFL def _compile(code, pattern, flags): # internal: compile a (sub)pattern emit = code.append for op, av in pattern: ! if op in (LITERAL, NOT_LITERAL): if flags & SRE_FLAG_IGNORECASE: emit(OPCODES[OP_IGNORE[op]]) --- 22,44 ---- MAXCODE = 0xFFFFFFFFL + def _identityfunction(x): + return x + + # use xrange if available + try: + xrange + except NameError: + xrange = range + def _compile(code, pattern, flags): # internal: compile a (sub)pattern emit = code.append + _len = len + LITERAL_CODES = {LITERAL:1, NOT_LITERAL:1} + REPEATING_CODES = {REPEAT:1, MIN_REPEAT:1, MAX_REPEAT:1} + SUCCESS_CODES = {SUCCESS:1, FAILURE:1} + ASSERT_CODES = {ASSERT:1, ASSERT_NOT:1} for op, av in pattern: ! if op in LITERAL_CODES: if flags & SRE_FLAG_IGNORECASE: emit(OPCODES[OP_IGNORE[op]]) *************** *** 40,47 **** else: emit(OPCODES[op]) ! fixup = lambda x: x ! skip = len(code); emit(0) _compile_charset(av, flags, code, fixup) ! code[skip] = len(code) - skip elif op is ANY: if flags & SRE_FLAG_DOTALL: --- 54,61 ---- else: emit(OPCODES[op]) ! fixup = _identityfunction ! skip = _len(code); emit(0) _compile_charset(av, flags, code, fixup) ! code[skip] = _len(code) - skip elif op is ANY: if flags & SRE_FLAG_DOTALL: *************** *** 49,81 **** else: emit(OPCODES[ANY]) ! elif op in (REPEAT, MIN_REPEAT, MAX_REPEAT): if flags & SRE_FLAG_TEMPLATE: raise error, "internal: unsupported template operator" emit(OPCODES[REPEAT]) ! skip = len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) emit(OPCODES[SUCCESS]) ! code[skip] = len(code) - skip ! elif _simple(av) and op != REPEAT: ! if op == MAX_REPEAT: emit(OPCODES[REPEAT_ONE]) else: emit(OPCODES[MIN_REPEAT_ONE]) ! skip = len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) emit(OPCODES[SUCCESS]) ! code[skip] = len(code) - skip else: emit(OPCODES[REPEAT]) ! skip = len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) ! code[skip] = len(code) - skip ! if op == MAX_REPEAT: emit(OPCODES[MAX_UNTIL]) else: --- 63,95 ---- else: emit(OPCODES[ANY]) ! elif op in REPEATING_CODES: if flags & SRE_FLAG_TEMPLATE: raise error, "internal: unsupported template operator" emit(OPCODES[REPEAT]) ! skip = _len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) emit(OPCODES[SUCCESS]) ! code[skip] = _len(code) - skip ! elif _simple(av) and op is not REPEAT: ! if op is MAX_REPEAT: emit(OPCODES[REPEAT_ONE]) else: emit(OPCODES[MIN_REPEAT_ONE]) ! skip = _len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) emit(OPCODES[SUCCESS]) ! code[skip] = _len(code) - skip else: emit(OPCODES[REPEAT]) ! skip = _len(code); emit(0) emit(av[0]) emit(av[1]) _compile(code, av[2], flags) ! code[skip] = _len(code) - skip ! if op is MAX_REPEAT: emit(OPCODES[MAX_UNTIL]) else: *************** *** 90,98 **** emit(OPCODES[MARK]) emit((av[0]-1)*2+1) ! elif op in (SUCCESS, FAILURE): emit(OPCODES[op]) ! elif op in (ASSERT, ASSERT_NOT): emit(OPCODES[op]) ! skip = len(code); emit(0) if av[0] >= 0: emit(0) # look ahead --- 104,112 ---- emit(OPCODES[MARK]) emit((av[0]-1)*2+1) ! elif op in SUCCESS_CODES: emit(OPCODES[op]) ! elif op in ASSERT_CODES: emit(OPCODES[op]) ! skip = _len(code); emit(0) if av[0] >= 0: emit(0) # look ahead *************** *** 104,114 **** _compile(code, av[1], flags) emit(OPCODES[SUCCESS]) ! code[skip] = len(code) - skip elif op is CALL: emit(OPCODES[op]) ! skip = len(code); emit(0) _compile(code, av, flags) emit(OPCODES[SUCCESS]) ! code[skip] = len(code) - skip elif op is AT: emit(OPCODES[op]) --- 118,128 ---- _compile(code, av[1], flags) emit(OPCODES[SUCCESS]) ! code[skip] = _len(code) - skip elif op is CALL: emit(OPCODES[op]) ! skip = _len(code); emit(0) _compile(code, av, flags) emit(OPCODES[SUCCESS]) ! code[skip] = _len(code) - skip elif op is AT: emit(OPCODES[op]) *************** *** 123,136 **** emit(OPCODES[op]) tail = [] for av in av[1]: ! skip = len(code); emit(0) # _compile_info(code, av, flags) _compile(code, av, flags) emit(OPCODES[JUMP]) ! tail.append(len(code)); emit(0) ! code[skip] = len(code) - skip emit(0) # end of branch for tail in tail: ! code[tail] = len(code) - tail elif op is CATEGORY: emit(OPCODES[op]) --- 137,151 ---- emit(OPCODES[op]) tail = [] + tailappend = tail.append for av in av[1]: ! skip = _len(code); emit(0) # _compile_info(code, av, flags) _compile(code, av, flags) emit(OPCODES[JUMP]) ! tailappend(_len(code)); emit(0) ! code[skip] = _len(code) - skip emit(0) # end of branch for tail in tail: ! code[tail] = _len(code) - tail elif op is CATEGORY: emit(OPCODES[op]) *************** *** 149,162 **** emit(OPCODES[op]) emit((av[0]-1)*2) ! skipyes = len(code); emit(0) _compile(code, av[1], flags) if av[2]: emit(OPCODES[JUMP]) ! skipno = len(code); emit(0) ! code[skipyes] = len(code) - skipyes + 1 _compile(code, av[2], flags) ! code[skipno] = len(code) - skipno else: ! code[skipyes] = len(code) - skipyes + 1 else: raise ValueError, ("unsupported operand type", op) --- 164,177 ---- emit(OPCODES[op]) emit((av[0]-1)*2) ! skipyes = _len(code); emit(0) _compile(code, av[1], flags) if av[2]: emit(OPCODES[JUMP]) ! skipno = _len(code); emit(0) ! code[skipyes] = _len(code) - skipyes + 1 _compile(code, av[2], flags) ! code[skipno] = _len(code) - skipno else: ! code[skipyes] = _len(code) - skipyes + 1 else: raise ValueError, ("unsupported operand type", op) *************** *** 166,170 **** emit = code.append if fixup is None: ! fixup = lambda x: x for op, av in _optimize_charset(charset, fixup): emit(OPCODES[op]) --- 181,185 ---- emit = code.append if fixup is None: ! fixup = _identityfunction for op, av in _optimize_charset(charset, fixup): emit(OPCODES[op]) *************** *** 194,202 **** # internal: optimize character set out = [] charmap = [False]*256 try: for op, av in charset: if op is NEGATE: ! out.append((op, av)) elif op is LITERAL: charmap[fixup(av)] = True --- 209,218 ---- # internal: optimize character set out = [] + outappend = out.append charmap = [False]*256 try: for op, av in charset: if op is NEGATE: ! outappend((op, av)) elif op is LITERAL: charmap[fixup(av)] = True *************** *** 213,216 **** --- 229,233 ---- i = p = n = 0 runs = [] + runsappend = runs.append for c in charmap: if c: *************** *** 219,234 **** n = n + 1 elif n: ! runs.append((p, n)) n = 0 i = i + 1 if n: ! runs.append((p, n)) if len(runs) <= 2: # use literal/range for p, n in runs: if n == 1: ! out.append((LITERAL, p)) else: ! out.append((RANGE, (p, p+n-1))) if len(out) < len(charset): return out --- 236,251 ---- n = n + 1 elif n: ! runsappend((p, n)) n = 0 i = i + 1 if n: ! runsappend((p, n)) if len(runs) <= 2: # use literal/range for p, n in runs: if n == 1: ! outappend((LITERAL, p)) else: ! outappend((RANGE, (p, p+n-1))) if len(out) < len(charset): return out *************** *** 236,240 **** # use bitmap data = _mk_bitmap(charmap) ! out.append((CHARSET, data)) return out return charset --- 253,257 ---- # use bitmap data = _mk_bitmap(charmap) ! outappend((CHARSET, data)) return out return charset *************** *** 242,245 **** --- 259,263 ---- def _mk_bitmap(bits): data = [] + dataappend = data.append if _sre.CODESIZE == 2: start = (1, 0) *************** *** 250,256 **** if c: v = v + m ! m = m << 1 if m > MAXCODE: ! data.append(v) m, v = start return data --- 268,274 ---- if c: v = v + m ! m = m + m if m > MAXCODE: ! dataappend(v) m, v = start return data *************** *** 296,300 **** charmap[fixup(av)] = True elif op is RANGE: ! for i in range(fixup(av[0]), fixup(av[1])+1): charmap[i] = True elif op is CATEGORY: --- 314,318 ---- charmap[fixup(av)] = True elif op is RANGE: ! for i in xrange(fixup(av[0]), fixup(av[1])+1): charmap[i] = True elif op is CATEGORY: *************** *** 308,312 **** # XXX: negation does not work with big charsets return charset ! for i in range(65536): charmap[i] = not charmap[i] comps = {} --- 326,330 ---- # XXX: negation does not work with big charsets return charset ! for i in xrange(65536): charmap[i] = not charmap[i] comps = {} *************** *** 314,318 **** block = 0 data = [] ! for i in range(256): chunk = tuple(charmap[i*256:(i+1)*256]) new = comps.setdefault(chunk, block) --- 332,336 ---- block = 0 data = [] ! for i in xrange(256): chunk = tuple(charmap[i*256:(i+1)*256]) new = comps.setdefault(chunk, block) *************** *** 349,354 **** --- 367,374 ---- # look for a literal prefix prefix = [] + prefixappend = prefix.append prefix_skip = 0 charset = [] # not used + charsetappend = charset.append if not (flags & SRE_FLAG_IGNORECASE): # look for literal prefix *************** *** 357,365 **** if len(prefix) == prefix_skip: prefix_skip = prefix_skip + 1 ! prefix.append(av) elif op is SUBPATTERN and len(av[1]) == 1: op, av = av[1][0] if op is LITERAL: ! prefix.append(av) else: break --- 377,385 ---- if len(prefix) == prefix_skip: prefix_skip = prefix_skip + 1 ! prefixappend(av) elif op is SUBPATTERN and len(av[1]) == 1: op, av = av[1][0] if op is LITERAL: ! prefixappend(av) else: break *************** *** 372,378 **** op, av = av[1][0] if op is LITERAL: ! charset.append((op, av)) elif op is BRANCH: c = [] for p in av[1]: if not p: --- 392,399 ---- op, av = av[1][0] if op is LITERAL: ! charsetappend((op, av)) elif op is BRANCH: c = [] + cappend = c.append for p in av[1]: if not p: *************** *** 380,384 **** op, av = p[0] if op is LITERAL: ! c.append((op, av)) else: break --- 401,405 ---- op, av = p[0] if op is LITERAL: ! cappend((op, av)) else: break *************** *** 387,390 **** --- 408,412 ---- elif op is BRANCH: c = [] + cappend = c.append for p in av[1]: if not p: *************** *** 392,396 **** op, av = p[0] if op is LITERAL: ! c.append((op, av)) else: break --- 414,418 ---- op, av = p[0] if op is LITERAL: ! cappend((op, av)) else: break *************** *** 433,437 **** # generate overlap table table = [-1] + ([0]*len(prefix)) ! for i in range(len(prefix)): table[i+1] = table[i]+1 while table[i+1] > 0 and prefix[i] != prefix[table[i+1]-1]: --- 455,459 ---- # generate overlap table table = [-1] + ([0]*len(prefix)) ! for i in xrange(len(prefix)): table[i+1] = table[i]+1 while table[i+1] > 0 and prefix[i] != prefix[table[i+1]-1]:

1 0

python/dist/src/Doc/tut tut.tex,1.225,1.226
by rhettinger＠users.sourceforge.net March 26, 2004

March 26, 2004

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24443 Modified Files: tut.tex Log Message: Update timeit example to reflect current performance. Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.225 retrieving revision 1.226 diff -C2 -d -r1.225 -r1.226 *** tut.tex 21 Mar 2004 22:12:45 -0000 1.225 --- tut.tex 26 Mar 2004 07:56:23 -0000 1.226 *************** *** 4635,4646 **** feature instead of the traditional approach to swapping arguments. The \ulink{\module{timeit}}{../lib/module-timeit.html} module ! quickly demonstrates that the traditional approach is faster: \begin{verbatim} >>> from timeit import Timer >>> Timer('t=a; a=b; b=t', 'a=1; b=2').timeit() ! 0.60864915603680925 >>> Timer('a,b = b,a', 'a=1; b=2').timeit() ! 0.8625194857439773 \end{verbatim} --- 4635,4646 ---- feature instead of the traditional approach to swapping arguments. The \ulink{\module{timeit}}{../lib/module-timeit.html} module ! quickly demonstrates a modest performance advantage: \begin{verbatim} >>> from timeit import Timer >>> Timer('t=a; a=b; b=t', 'a=1; b=2').timeit() ! 0.57535828626024577 >>> Timer('a,b = b,a', 'a=1; b=2').timeit() ! 0.54962537085770791 \end{verbatim}

1 0

Stock to climb on unprecedented run of profitability iwysnilsokypkewv
by Kristi Abbott March 25, 2004

March 25, 2004

**SRGE****SRGE****SRGE****SRGE****SRGE****SRGE** Market Watch News Flash Explosive short term trading profits in a new technology issue (Ticker: SRGE) are being predicted as many significant news releases indicate strong contractual revenues with major Telecom firms. SRGE has been successfully working with Telecommunications giants (with five million subscriber lines) over the last 4 years, but is now projecting "a banner expansion year with geometric growth in revenues" due largely to sales demands for their innovative patented products and expansion into International telecom markets. Surge Technologies, Inc. (SRGE) is a cutting-edge leader that designs, develops, manufactures, and markets superior patented outside plant electrical surge protection equipment for the telecommunications industry. The US sales projections for this market are $4 Billion annually, with this figure growing rapidly as the expansion of new HDSL and ADSL technologies permeate the industry. SRGE provides the Telecom industry with the highest quality "protection element" for complex digital switches. Protecting these Telecom switching devices is crucial to inclusive components that are sensitive to interruptions in voltage which can cause extensive network damage, thus negating costly and time-consuming repair and down-time. Major Telecoms require this protection throughout their network in order to prevent the hazards of harming personnel, damaging expensive equipment, and massive system failures. Opening Price: 1.15 10 Day Target: 2.30 1 Month Target: 4.50 Outstanding Shares: 16.5 million Est. Float: 2.2 million How many times have you seen issues explode but you couldn't get your hands on them or didn't have the right information in time? We are alerting you now to a special Company with a unique technology that is on the forefront of a breakout! We are excited about SRGE's technology and expansion as they prepare to ink deal after deal with Major US Telecoms in conjunction with dramatic increases in revenue for 2004 and 2005. SRGE has made phenomenal advancements but may be one of the few stocks left in this industry group that is unknown and undervalued, therefore a 300%-400% jump may wind up being conservative. -------------------------------------------------------- Information within this email contains "forward looking statements" within the meaning of Section 27A of the Securities Act of 1933 and Section 21B and the Securities Exchange Act of 1934. Any statements that express or involve discussions with respect to predictions, goals, expectations, beliefs, plans, projections, objectives, assumptions or future events or performance are not statements of historical fact and may be "forward looking statements". Forward looking statements are based upon expectations, estimates and projections, at the time the statements are made that involve a number of risks and uncertainties which could cause actual results or events to differ materially from those presently anticipated. Forward looking statements in this action may be identified through the use of words such as: "projects", "foresee", "expects", "estimates", "believes", "understands", "will", "anticipates", or that by statements indicating certain actions "may", "could", or "might" occur. All information provided within this email pertaining to investing, stocks, securities must be understood as information provided and not investment advice. Emerging Equity Alert advises all readers and subscribers to seek advice from a registered professional securities representative before deciding to trade in stocks featured within this email. None of the material within this report shall be construed as any kind of investment advice. In compliance with Section 17(b), we disclose the holdings of independently purchased shares of srge prior to the publication of this report. Be aware of an inherent conflict of interest resulting from such holdings due to our intent to profit from the liquidation of these shares. Shares may be sold at any time, even after positive statements have been made regarding the above company. pxsrthlippplzkdf lia qvg j

1 0

python/dist/src/Lib/distutils/command build_scripts.py, 1.21, 1.22 sdist.py, 1.56, 1.57
by fdrake＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16236 Modified Files: build_scripts.py sdist.py Log Message: make sure the default manifest generation includes files identified as scripts closes SF bug 796042 Index: build_scripts.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_scripts.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** build_scripts.py 27 Jun 2003 19:33:38 -0000 1.21 --- build_scripts.py 25 Mar 2004 22:04:51 -0000 1.22 *************** *** 42,45 **** --- 42,47 ---- self.scripts = self.distribution.scripts + def get_source_files(self): + return self.scripts def run (self): Index: sdist.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** sdist.py 19 Nov 2002 13:12:28 -0000 1.56 --- sdist.py 25 Mar 2004 22:04:52 -0000 1.57 *************** *** 305,308 **** --- 305,312 ---- self.filelist.extend(build_clib.get_source_files()) + if self.distribution.has_scripts(): + build_scripts = self.get_finalized_command('build_scripts') + self.filelist.extend(build_scripts.get_source_files()) + # add_defaults ()

1 0

python/nondist/peps pep-0318.txt,1.5,1.6
by montanaro＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10566 Modified Files: pep-0318.txt Log Message: Add verbiage about class decorators and their status Index: pep-0318.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0318.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pep-0318.txt 23 Mar 2004 16:41:17 -0000 1.5 --- pep-0318.txt 25 Mar 2004 21:45:58 -0000 1.6 *************** *** 1,4 **** PEP: 318 ! Title: Function/Method Decorator Syntax Version: $Revision$ Last-Modified: $Date$ --- 1,4 ---- PEP: 318 ! Title: Decorators for Functions, Methods and Classes Version: $Revision$ Last-Modified: $Date$ *************** *** 16,24 **** Abstract ======== ! ! The current method for declaring class and static methods is awkward ! and can lead to code that is difficult to understand. Ideally, these ! transformations should be made at the same point in the code where the ! declaration itself is made. This PEP introduces new syntax for transformations of a declaration. --- 16,24 ---- Abstract ======== ! ! The current method for declaring class and static methods is awkward ! and can lead to code that is difficult to understand. Ideally, these ! transformations should be made at the same point in the code where the ! declaration itself is made. This PEP introduces new syntax for transformations of a declaration. *************** *** 55,58 **** --- 55,65 ---- pass + Modifying classes in this fashion is also possible, though the + benefits are not as immediately apparent. Almost certainly, anything + which could be done with class decorators could be done using + metaclasses, but using metaclasses is sufficiently obscure that there + is some attraction to having an easier way to make simple + modifications to classes. + Background ========== *************** *** 65,70 **** the topic`_ on ``python-dev`` shortly after the conference, attributing the bracketed syntax to an earlier proposal on ! ``comp.lang.python`` by `Gareth ! McCaughan`_. .. _syntactic support for decorators: http://www.python.org/doc/essays/ppt/python10/py10keynote.pdf --- 72,76 ---- the topic`_ on ``python-dev`` shortly after the conference, attributing the bracketed syntax to an earlier proposal on ! ``comp.lang.python`` by `Gareth McCaughan`_. .. _syntactic support for decorators: http://www.python.org/doc/essays/ppt/python10/py10keynote.pdf *************** *** 74,77 **** --- 80,86 ---- .. _gareth mccaughan: http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=slrna40k88… + Class decorations seem like an obvious next step because class + definition and function definition are syntactically similar. + Design Goals ============ *************** *** 84,98 **** * work with multiple wrappers per definition ! * make it obvious what is happening; at the very least it should be ! obvious that new users can safely ignore it when writing their own code * not make future extensions more difficult ! * be easy to type; programs that use it are expected to use it very frequently ! * not make it more difficult to scan through code quickly. It should ! still be easy to search for all definitions, a particular definition, or the arguments that a function accepts --- 93,107 ---- * work with multiple wrappers per definition ! * make it obvious what is happening; at the very least it should be ! obvious that new users can safely ignore it when writing their own code * not make future extensions more difficult ! * be easy to type; programs that use it are expected to use it very frequently ! * not make it more difficult to scan through code quickly. It should ! still be easy to search for all definitions, a particular definition, or the arguments that a function accepts *************** *** 106,110 **** =============== ! The currently proposed syntax is:: def func(arg1, arg2, ...) [dec1, dec2, ...]: --- 115,119 ---- =============== ! The currently proposed syntax for function decorators is:: def func(arg1, arg2, ...) [dec1, dec2, ...]: *************** *** 115,118 **** --- 124,132 ---- easily break long lists of decorators across multiple lines. + Class decorators are defined in an analogous fashion:: + + class MyClass(base1, base2) [dec1, dec2, ...]: + pass + Alternate Proposals =================== *************** *** 124,129 **** The absence of brackets makes it cumbersome to break long lists of ! decorators across multiple lines. The keyword "as" doesn't have the ! same meaning as its use in the ``import`` statement. :: --- 138,146 ---- The absence of brackets makes it cumbersome to break long lists of ! decorators across multiple lines, and the keyword "as" doesn't have ! the same meaning as its use in the ``import`` statement. Plenty of ! `alternatives to "as"`_ have been proposed. :-) ! ! .. _alternatives to "as": http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=mailman… :: *************** *** 132,136 **** pass ! This form has the disadvantage that the decorators become visually higher priority than the function name and argument list. --- 149,153 ---- pass ! This form has the disadvantage that the decorators visually assume higher priority than the function name and argument list. *************** *** 140,148 **** pass ! Quixote's Page Template Language uses this form, but only supports a single decorator chosen from a restricted set. For short lists it works okay, but for long list it separates the argument list from the function name. :: --- 157,167 ---- pass ! Quixote's `Python Template Language`_ uses this form, but only supports a single decorator chosen from a restricted set. For short lists it works okay, but for long list it separates the argument list from the function name. + .. _Python Template Language: http://www.mems-exchange.org/software/quixote/doc/PTL.html + :: *************** *** 157,169 **** it impossible to tell which objects following the block will be decorated. Nesting the function definition within the using: block ! suggests block structure that doesn't exist. The name ``foo`` would ! actually exist at the same scope as the using: block. Finally, it ! would require the introduction of a new keyword. Current Implementation ====================== ! Michael Hudson has posted a `patch`_ at Starship, which implements the ! proposed syntax and left-first application of decorators:: def func(arg1, arg2, ...) [dec1, dec2]: --- 176,189 ---- it impossible to tell which objects following the block will be decorated. Nesting the function definition within the using: block ! suggests nesting of namespaces that doesn't exist. The name ``foo`` ! would actually exist at the same scope as the using: block. Finally, ! it would require the introduction of a new keyword. Current Implementation ====================== ! Michael Hudson posted a `patch`_ at Starship, which implements the ! proposed syntax changes for both functions and classes and left-first ! application of decorators:: def func(arg1, arg2, ...) [dec1, dec2]: *************** *** 178,182 **** though without the intermediate creation of a variable named ``func``. ! .. _patch: http://starship.python.net/crew/mwh/hacks/meth-syntax-sugar.diff Examples --- 198,202 ---- though without the intermediate creation of a variable named ``func``. ! .. _patch: http://starship.python.net/crew/mwh/hacks/meth-syntax-sugar-3.diff Examples *************** *** 184,190 **** Much of the discussion on ``comp.lang.python`` and the ``python-dev`` ! mailing list focuses on the use of the ``staticmethod()`` and ! ``classmethod()`` builtins. This capability is much more powerful ! than that. This section presents some examples of use. 1. Define a function to be executed at exit. Note that the function --- 204,211 ---- Much of the discussion on ``comp.lang.python`` and the ``python-dev`` ! mailing list focuses on the use of decorators as a cleaner way to use ! the ``staticmethod()`` and ``classmethod()`` builtins. This ! capability is much more powerful than that. This section presents ! some examples of use. 1. Define a function to be executed at exit. Note that the function *************** *** 225,230 **** return decorate ! def classmethod(f) [release(versionadded="2.2", ! author="Guido van Rossum")]: ... --- 246,251 ---- return decorate ! def mymethod(f) [release(versionadded="2.2", ! author="Guido van Rossum")]: ... *************** *** 235,238 **** --- 256,260 ---- def accepts(*types): def check_accepts(f): + assert len(types) == f.func_code.co_argcount def new_f(*args, **kwds): for (a, t) in zip(args, types): *************** *** 240,244 **** "arg %r does not match %s" % (a,t) return f(*args, **kwds) - assert len(types) == f.func_code.co_argcount return new_f return check_accepts --- 262,265 ---- *************** *** 258,275 **** return arg1 * arg2 Of course, all these examples are possible today, though without the syntactic support. ! Possible Extensions ! =================== ! ! The proposed syntax is general enough that it could be used on class ! definitions as well:: ! class foo(object) [dec1, dec2, ...]: ! class definition here ! Use would likely be much less than function decorators. The current ! patch only implements function decorators. --- 279,319 ---- return arg1 * arg2 + 5. Declare that a class implements a particular (set of) interface(s). + This is from a posting by Bob Ippolito on ``python-dev`` based on + experience with `PyProtocols`_. + + .. _PyProtocols: http://peak.telecommunity.com/PyProtocols.html + :: + + def provides(*interfaces): + """ + An actual, working, implementation of provides for + the current implementation of PyProtocols. Not + particularly important for the PEP text. + """ + def provides(typ): + declareImplementation(typ, instancesProvide=interfaces) + return typ + return provides + + class IBar(Interface): + """Declare something about IBar here""" + + class Foo(object) [provides(IBar)]: + """Implement something here...""" + Of course, all these examples are possible today, though without the syntactic support. ! Open Issues ! =========== ! 1. It's not yet certain that class decorators will be incorporated ! into the language at this point. Guido expressed skepticism about ! the concept, but various people have made some `strong arguments`_ ! (search for ``PEP 318 - posting draft``) on their behalf in ! ``python-dev``. ! .. _strong arguments: http://mail.python.org/pipermail/python-dev/2004-March/thread.html

1 0

python/dist/src/Lib platform.py,1.5.8.2,1.5.8.3
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32702/Lib Modified Files: Tag: release23-maint platform.py Log Message: Fix last patch to make backwards-compatible with Python 1.5.2 . Bumped up micro version number. Index: platform.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v retrieving revision 1.5.8.2 retrieving revision 1.5.8.3 diff -C2 -d -r1.5.8.2 -r1.5.8.3 *** platform.py 25 Mar 2004 16:56:14 -0000 1.5.8.2 --- platform.py 25 Mar 2004 18:35:38 -0000 1.5.8.3 *************** *** 32,35 **** --- 32,36 ---- # # History: + # 1.0.2 - fix a bug with caching of value for platform() # 1.0.1 - reformatted to make doc.py happy # 1.0.0 - reformatted a bit and checked into Python CVS *************** *** 103,107 **** """ ! __version__ = '1.0.1' import sys,string,os,re --- 104,108 ---- """ ! __version__ = '1.0.2' import sys,string,os,re *************** *** 202,206 **** # Check for slackware verson tag file (thanks to Greg Andruk) verfiles = os.listdir('/usr/lib/setup') ! for n in range(len(verfiles)-1, -1, -1): if verfiles[n][:14] != 'slack-version-': del verfiles[n] --- 203,207 ---- # Check for slackware verson tag file (thanks to Greg Andruk) verfiles = os.listdir('/usr/lib/setup') ! for n in reversed(xrange(len(verfiles))): if verfiles[n][:14] != 'slack-version-': del verfiles[n] *************** *** 1083,1087 **** """ global _sys_version_cache - import time if _sys_version_cache is not None: --- 1084,1087 ---- *************** *** 1137,1142 **** ### The Opus Magnum of platform strings :-) ! _platform_cache = {True:None, False:None} ! _platform_aliased_cache = {True:None, False:None} def platform(aliased=0, terse=0): --- 1137,1144 ---- ### The Opus Magnum of platform strings :-) ! _platform_cache_terse = None ! _platform_cache_not_terse = None ! _platform_aliased_cache_terse = None ! _platform_aliased_cache_not_terse = None def platform(aliased=0, terse=0): *************** *** 1159,1168 **** """ ! global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache[bool(terse)] is not None): ! return _platform_cache[bool(terse)] ! elif _platform_aliased_cache[bool(terse)] is not None: ! return _platform_aliased_cache[bool(terse)] # Get uname information and then apply platform specific cosmetics --- 1161,1175 ---- """ ! global _platform_cache_terse, _platform_cache_not_terse ! global _platform_aliased_cache_terse, _platform_aliased_cache_not_terse ! if not aliased and terse and (_platform_cache_terse is not None): ! return _platform_cache_terse ! elif not aliased and not terse and (_platform_cache_not_terse is not None): ! return _platform_cache_not_terse ! elif terse and _platform_aliased_cache_terse is not None: ! return _platform_aliased_cache_terse ! elif not terse and _platform_aliased_cache_not_terse is not None: ! return _platform_aliased_cache_not_terse # Get uname information and then apply platform specific cosmetics *************** *** 1220,1229 **** platform = _platform(system,release,machine,processor,bits,linkage) ! if aliased: ! _platform_aliased_cache[bool(terse)] = platform elif terse: pass else: ! _platform_cache[bool(terse)] = platform return platform --- 1227,1241 ---- platform = _platform(system,release,machine,processor,bits,linkage) ! if aliased and terse: ! _platform_aliased_cache_terse = platform ! elif aliased and not terse: ! _platform_aliased_cache_not_terse = platform elif terse: pass else: ! if terse: ! _platform_cache_terse = platform ! else: ! _platform_cache_not_terse = platform return platform

1 0