Mailman 3 February 2005 - Python-checkins

python/dist/src/Lib/test test_copy.py, 1.11.8.2, 1.11.8.3
by aleax＠users.sourceforge.net Feb. 7, 2005

Feb. 7, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31915 Modified Files: Tag: release23-maint test_copy.py Log Message: sligtly strengthen unit tests for copy.py Index: test_copy.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy.py,v retrieving revision 1.11.8.2 retrieving revision 1.11.8.3 diff -u -d -r1.11.8.2 -r1.11.8.3 --- test_copy.py 6 Feb 2005 07:56:18 -0000 1.11.8.2 +++ test_copy.py 7 Feb 2005 12:18:26 -0000 1.11.8.3 @@ -185,7 +185,33 @@ self.assert_(x is not y) self.assert_(x.tag is not y.tag) - # regression tests for metaclass-confusion + # regression tests for class-vs-instance and metaclass-confusion + def test_copy_classoverinstance(self): + class C(object): + def __init__(self, v): + self.v = v + def __cmp__(self, other): + return -cmp(other, self.v) + def __copy__(self): + return self.__class__(self.v) + x = C(23) + self.assertEqual(copy.copy(x), x) + x.__copy__ = lambda: 42 + self.assertEqual(copy.copy(x), x) + + def test_deepcopy_classoverinstance(self): + class C(object): + def __init__(self, v): + self.v = v + def __cmp__(self, other): + return -cmp(other, self.v) + def __deepcopy__(self, memo): + return self.__class__(copy.deepcopy(self.v, memo)) + x = C(23) + self.assertEqual(copy.deepcopy(x), x) + x.__deepcopy__ = lambda memo: 42 + self.assertEqual(copy.deepcopy(x), x) + def test_copy_metaclassconfusion(self): class MyOwnError(copy.Error): pass

1 0

python/dist/src/Modules _testcapimodule.c, 1.24.10.1, 1.24.10.2
by aleax＠users.sourceforge.net Feb. 7, 2005

Feb. 7, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29103/Modules Modified Files: Tag: release23-maint _testcapimodule.c Log Message: tiny backport from 2.4, fix a leak in _testcapi Index: _testcapimodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_testcapimodule.c,v retrieving revision 1.24.10.1 retrieving revision 1.24.10.2 diff -u -d -r1.24.10.1 -r1.24.10.2 --- _testcapimodule.c 25 Jan 2005 12:52:18 -0000 1.24.10.1 +++ _testcapimodule.c 7 Feb 2005 12:04:22 -0000 1.24.10.2 @@ -544,6 +544,7 @@ PyTuple_SET_ITEM(exc_args, i, v); } PyErr_SetObject(exc, exc_args); + Py_DECREF(exc_args); return NULL; }

1 0

python/dist/src/Lib/test test_peepholer.py, 1.8, 1.9
by rhettinger＠users.sourceforge.net Feb. 6, 2005

Feb. 6, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26507/Lib/test Modified Files: test_peepholer.py Log Message: Transform "x in (1,2,3)" to "x in frozenset([1,2,3])". Inspired by Skip's idea to recognize the throw-away nature of sequences in this context and to transform their type to one with better performance. Index: test_peepholer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_peepholer.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test_peepholer.py 26 Jan 2005 12:50:05 -0000 1.8 +++ test_peepholer.py 6 Feb 2005 22:05:42 -0000 1.9 @@ -133,6 +133,16 @@ asm = dis_single('a="x"*1000') self.assert_('(1000)' in asm) + def test_set_conversion(self): + for line in ( + 'x in (1,2,3)', + 'x not in (1,2,3)', + 'not x in (1,2,3)', + 'not x not in (1,2,3)', + ): + asm = dis_single(line) + self.assert_('frozenset' in asm) + def test_elim_extra_return(self): # RETURN LOAD_CONST None RETURN --> RETURN def f(x):

1 0

python/dist/src/Python compile.c,2.340,2.341
by rhettinger＠users.sourceforge.net Feb. 6, 2005

Feb. 6, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26507/Python Modified Files: compile.c Log Message: Transform "x in (1,2,3)" to "x in frozenset([1,2,3])". Inspired by Skip's idea to recognize the throw-away nature of sequences in this context and to transform their type to one with better performance. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.340 retrieving revision 2.341 diff -u -d -r2.340 -r2.341 --- compile.c 26 Jan 2005 12:50:04 -0000 2.340 +++ compile.c 6 Feb 2005 22:05:38 -0000 2.341 @@ -540,6 +540,47 @@ return 1; } +/* Replace LOAD_CONST tuple with LOAD_CONST frozenset in the context + of a single-use constant for "in" and "not in" tests. +*/ +int +try_set_conversion(unsigned char *codestr, PyObject *consts) +{ + PyObject *newconst, *constant; + int arg, len_consts; + + /* Pre-conditions */ + assert(PyList_CheckExact(consts)); + assert(codestr[0] == LOAD_CONST); + assert(codestr[3] == COMPARE_OP); + assert(GETARG(codestr, 3) == 6 || GETARG(codestr, 3) == 7); + + /* Attempt to convert constant to a frozenset. Bail-out with no + changes if the tuple contains unhashable values. */ + arg = GETARG(codestr, 0); + constant = PyList_GET_ITEM(consts, arg); + if (constant->ob_type != &PyTuple_Type) + return 0; + newconst = PyObject_CallFunctionObjArgs( + (PyObject *)&PyFrozenSet_Type, constant, NULL); + if (newconst == NULL) { + PyErr_Clear(); + return 0; + } + + /* Append new constant onto consts list.*/ + len_consts = PyList_GET_SIZE(consts); + if (PyList_Append(consts, newconst)) { + Py_DECREF(newconst); + return 0; + } + Py_DECREF(newconst); + + /* Write new LOAD_CONST newconst on top of LOAD_CONST oldconst */ + SETARG(codestr, 0, len_consts); + return 1; +} + static unsigned int * markblocks(unsigned char *code, int len) { @@ -665,9 +706,15 @@ /* not a is b --> a is not b not a in b --> a not in b not a is not b --> a is b - not a not in b --> a in b */ + not a not in b --> a in b + + a in c --> a in frozenset(c) + where c is a constant tuple of hashable values + */ case COMPARE_OP: j = GETARG(codestr, i); + if (lastlc >= 1 && (j == 6 || j == 7) && ISBASICBLOCK(blocks,i-3,6)) + try_set_conversion(&codestr[i-3], consts); if (j < 6 || j > 9 || codestr[i+3] != UNARY_NOT || !ISBASICBLOCK(blocks,i,4))

1 0

python/dist/src/Lib copy.py,1.42.8.1,1.42.8.2
by aleax＠users.sourceforge.net Feb. 6, 2005

Feb. 6, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20725 Modified Files: Tag: release23-maint copy.py Log Message: fix bug 1114776 Index: copy.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/copy.py,v retrieving revision 1.42.8.1 retrieving revision 1.42.8.2 diff -u -d -r1.42.8.1 -r1.42.8.2 --- copy.py 25 Jan 2005 12:52:18 -0000 1.42.8.1 +++ copy.py 6 Feb 2005 07:56:18 -0000 1.42.8.2 @@ -62,8 +62,9 @@ __all__ = ["Error", "copy", "deepcopy"] +import inspect def _getspecial(cls, name): - for basecls in cls.__mro__: + for basecls in inspect.getmro(cls): try: return basecls.__dict__[name] except:

1 0

python/dist/src/Lib cgitb.py, 1.15, 1.16 cookielib.py, 1.5, 1.6 decimal.py, 1.32, 1.33 inspect.py, 1.59, 1.60 mhlib.py, 1.38, 1.39 posixfile.py, 1.27, 1.28 pydoc.py, 1.102, 1.103 smtplib.py, 1.68, 1.69 urllib2.py, 1.80, 1.81 warnings.py, 1.25, 1.26 whichdb.py, 1.19, 1.20
by rhettinger＠users.sourceforge.net Feb. 6, 2005

Feb. 6, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12661 Modified Files: cgitb.py cookielib.py decimal.py inspect.py mhlib.py posixfile.py pydoc.py smtplib.py urllib2.py warnings.py whichdb.py Log Message: Replace list of constants with tuples of constants. Index: cgitb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cgitb.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- cgitb.py 18 Jul 2004 06:14:41 -0000 1.15 +++ cgitb.py 6 Feb 2005 06:57:07 -0000 1.16 @@ -146,7 +146,7 @@ if name in done: continue done[name] = 1 if value is not __UNDEF__: - if where in ['global', 'builtin']: + if where in ('global', 'builtin'): name = ('<em>%s</em> ' % where) + strong(name) elif where == 'local': name = strong(name) Index: cookielib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cookielib.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cookielib.py 5 Feb 2005 01:31:17 -0000 1.5 +++ cookielib.py 6 Feb 2005 06:57:07 -0000 1.6 @@ -783,12 +783,12 @@ def __repr__(self): args = [] - for name in ["version", "name", "value", + for name in ("version", "name", "value", "port", "port_specified", "domain", "domain_specified", "domain_initial_dot", "path", "path_specified", "secure", "expires", "discard", "comment", "comment_url", - ]: + ): attr = getattr(self, name) args.append("%s=%s" % (name, repr(attr))) args.append("rest=%s" % repr(self._rest)) @@ -981,9 +981,9 @@ if j == 0: # domain like .foo.bar tld = domain[i+1:] sld = domain[j+1:i] - if (sld.lower() in [ + if (sld.lower() in ( "co", "ac", - "com", "edu", "org", "net", "gov", "mil", "int"] and + "com", "edu", "org", "net", "gov", "mil", "int") and len(tld) == 2): # domain like .co.uk debug(" country-code second level domain %s", domain) @@ -1415,7 +1415,7 @@ v = self._now + v if (k in value_attrs) or (k in boolean_attrs): if (v is None and - k not in ["port", "comment", "commenturl"]): + k not in ("port", "comment", "commenturl")): debug(" missing value for %s attribute" % k) bad_cookie = True break Index: decimal.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/decimal.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- decimal.py 18 Dec 2004 19:07:15 -0000 1.32 +++ decimal.py 6 Feb 2005 06:57:07 -0000 1.33 @@ -515,7 +515,7 @@ if isinstance(value, (list,tuple)): if len(value) != 3: raise ValueError, 'Invalid arguments' - if value[0] not in [0,1]: + if value[0] not in (0,1): raise ValueError, 'Invalid sign' for digit in value[1]: if not isinstance(digit, (int,long)) or digit < 0: Index: inspect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- inspect.py 12 Dec 2004 16:46:28 -0000 1.59 +++ inspect.py 6 Feb 2005 06:57:07 -0000 1.60 @@ -346,7 +346,7 @@ def getsourcefile(object): """Return the Python source file an object was defined in, if it exists.""" filename = getfile(object) - if string.lower(filename[-4:]) in ['.pyc', '.pyo']: + if string.lower(filename[-4:]) in ('.pyc', '.pyo'): filename = filename[:-4] + '.py' for suffix, mode, kind in imp.get_suffixes(): if 'b' in mode and string.lower(filename[-len(suffix):]) == suffix: @@ -453,7 +453,7 @@ # Look for a comment block at the top of the file. start = 0 if lines and lines[0][:2] == '#!': start = 1 - while start < len(lines) and string.strip(lines[start]) in ['', '#']: + while start < len(lines) and string.strip(lines[start]) in ('', '#'): start = start + 1 if start < len(lines) and lines[start][:1] == '#': comments = [] @@ -621,7 +621,7 @@ # The following acrobatics are for anonymous (tuple) arguments. for i in range(nargs): - if args[i][:1] in ['', '.']: + if args[i][:1] in ('', '.'): stack, remain, count = [], [], [] while step < len(code): op = ord(code[step]) @@ -630,7 +630,7 @@ opname = dis.opname[op] value = ord(code[step]) + ord(code[step+1])*256 step = step + 2 - if opname in ['UNPACK_TUPLE', 'UNPACK_SEQUENCE']: + if opname in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'): remain.append(value) count.append(value) elif opname == 'STORE_FAST': @@ -696,7 +696,7 @@ def strseq(object, convert, join=joinseq): """Recursively walk a sequence, stringifying each element.""" - if type(object) in [types.ListType, types.TupleType]: + if type(object) in (list, tuple): return join(map(lambda o, c=convert, j=join: strseq(o, c, j), object)) else: return convert(object) Index: mhlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/mhlib.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- mhlib.py 31 Dec 2004 19:15:26 -0000 1.38 +++ mhlib.py 6 Feb 2005 06:57:07 -0000 1.39 @@ -982,11 +982,11 @@ context = mh.getcontext() f = mh.openfolder(context) do('f.getcurrent()') - for seq in ['first', 'last', 'cur', '.', 'prev', 'next', + for seq in ('first', 'last', 'cur', '.', 'prev', 'next', 'first:3', 'last:3', 'cur:3', 'cur:-3', 'prev:3', 'next:3', '1:3', '1:-3', '100:3', '100:-3', '10000:3', '10000:-3', - 'all']: + 'all'): try: do('f.parsesequence(%r)' % (seq,)) except Error, msg: Index: posixfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/posixfile.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- posixfile.py 5 Dec 2004 04:55:09 -0000 1.27 +++ posixfile.py 6 Feb 2005 06:57:07 -0000 1.28 @@ -182,7 +182,7 @@ 'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'): flock = struct.pack('lxxxxlxxxxlhh', \ l_start, l_len, os.getpid(), l_type, l_whence) - elif sys.platform in ['aix3', 'aix4']: + elif sys.platform in ('aix3', 'aix4'): flock = struct.pack('hhlllii', \ l_type, l_whence, l_start, l_len, 0, 0, 0) else: @@ -198,7 +198,7 @@ 'bsdos2', 'bsdos3', 'bsdos4'): l_start, l_len, l_pid, l_type, l_whence = \ struct.unpack('lxxxxlxxxxlhh', flock) - elif sys.platform in ['aix3', 'aix4']: + elif sys.platform in ('aix3', 'aix4'): l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \ struct.unpack('hhlllii', flock) elif sys.platform == "linux2": Index: pydoc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- pydoc.py 8 Jan 2005 20:16:43 -0000 1.102 +++ pydoc.py 6 Feb 2005 06:57:07 -0000 1.103 @@ -153,8 +153,8 @@ def visiblename(name, all=None): """Decide whether to show documentation on a variable.""" # Certain special names are redundant. - if name in ['__builtins__', '__doc__', '__file__', '__path__', - '__module__', '__name__', '__slots__']: return 0 + if name in ('__builtins__', '__doc__', '__file__', '__path__', + '__module__', '__name__', '__slots__'): return 0 # Private names are hidden, but special names are displayed. if name.startswith('__') and name.endswith('__'): return 1 if all is not None: @@ -176,7 +176,7 @@ def ispackage(path): """Guess whether a path refers to a package directory.""" if os.path.isdir(path): - for ext in ['.py', '.pyc', '.pyo']: + for ext in ('.py', '.pyc', '.pyo'): if os.path.isfile(os.path.join(path, '__init__' + ext)): return True return False @@ -1298,12 +1298,12 @@ return plainpager if not sys.stdin.isatty() or not sys.stdout.isatty(): return plainpager - if os.environ.get('TERM') in ['dumb', 'emacs']: + if os.environ.get('TERM') in ('dumb', 'emacs'): return plainpager if 'PAGER' in os.environ: if sys.platform == 'win32': # pipes completely broken in Windows return lambda text: tempfilepager(plain(text), os.environ['PAGER']) - elif os.environ.get('TERM') in ['dumb', 'emacs']: + elif os.environ.get('TERM') in ('dumb', 'emacs'): return lambda text: pipepager(plain(text), os.environ['PAGER']) else: return lambda text: pipepager(text, os.environ['PAGER']) @@ -1369,14 +1369,14 @@ sys.stdout.flush() c = getchar() - if c in ['q', 'Q']: + if c in ('q', 'Q'): sys.stdout.write('\r \r') break - elif c in ['\r', '\n']: + elif c in ('\r', '\n'): sys.stdout.write('\r \r' + lines[r] + '\n') r = r + 1 continue - if c in ['b', 'B', '\x1b']: + if c in ('b', 'B', '\x1b'): r = r - inc - inc if r < 0: r = 0 sys.stdout.write('\n' + join(lines[r:r+inc], '\n') + '\n') @@ -1646,7 +1646,7 @@ except (KeyboardInterrupt, EOFError): break request = strip(replace(request, '"', '', "'", '')) - if lower(request) in ['q', 'quit']: break + if lower(request) in ('q', 'quit'): break self.help(request) def getline(self, prompt): Index: smtplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/smtplib.py,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- smtplib.py 16 Jan 2005 13:04:30 -0000 1.68 +++ smtplib.py 6 Feb 2005 06:57:08 -0000 1.69 @@ -578,7 +578,7 @@ (code, resp) = self.docmd(encode_base64(password, eol="")) elif authmethod is None: raise SMTPException("No suitable authentication method found.") - if code not in [235, 503]: + if code not in (235, 503): # 235 == 'Authentication successful' # 503 == 'Error: already authenticated' raise SMTPAuthenticationError(code, resp) Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- urllib2.py 5 Feb 2005 14:37:06 -0000 1.80 +++ urllib2.py 6 Feb 2005 06:57:08 -0000 1.81 @@ -384,7 +384,7 @@ 'unknown_open', req) def error(self, proto, *args): - if proto in ['http', 'https']: + if proto in ('http', 'https'): # XXX http[s] protocols are special-cased dict = self.handle_error['http'] # https is not different than http proto = args[2] # YUCK! Index: warnings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/warnings.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- warnings.py 29 Dec 2004 15:28:09 -0000 1.25 +++ warnings.py 6 Feb 2005 06:57:08 -0000 1.26 @@ -216,7 +216,7 @@ if not action: return "default" if action == "all": return "always" # Alias - for a in ['default', 'always', 'ignore', 'module', 'once', 'error']: + for a in ('default', 'always', 'ignore', 'module', 'once', 'error'): if a.startswith(action): return a raise _OptionError("invalid action: %r" % (action,)) Index: whichdb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/whichdb.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- whichdb.py 20 Oct 2004 07:17:16 -0000 1.19 +++ whichdb.py 6 Feb 2005 06:57:08 -0000 1.20 @@ -62,7 +62,7 @@ return "dumbdbm" f = open(filename + os.extsep + "dir", "rb") try: - if f.read(1) in ["'", '"']: + if f.read(1) in ("'", '"'): return "dumbdbm" finally: f.close()

1 0

python/dist/src/Objects dictobject.c,2.162,2.163
by rhettinger＠users.sourceforge.net Feb. 5, 2005

Feb. 5, 2005

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31379 Modified Files: dictobject.c Log Message: Code simplification -- eliminate lookup when value is known in advance. Index: dictobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v retrieving revision 2.162 retrieving revision 2.163 diff -u -d -r2.162 -r2.163 --- dictobject.c 15 Jul 2004 15:54:04 -0000 2.162 +++ dictobject.c 5 Feb 2005 23:42:57 -0000 2.163 @@ -400,8 +400,10 @@ else { if (ep->me_key == NULL) mp->ma_fill++; - else - Py_DECREF(ep->me_key); + else { + assert(ep->me_key == dummy); + Py_DECREF(dummy); + } ep->me_key = key; ep->me_hash = hash; ep->me_value = value;

1 0

python/dist/src/Lib urllib2.py,1.79,1.80
by rhettinger＠users.sourceforge.net Feb. 5, 2005

Feb. 5, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13622 Modified Files: urllib2.py Log Message: SF patch #1028908 (John J Lee) Minor code clarification and simplification. Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- urllib2.py 9 Jan 2005 05:51:49 -0000 1.79 +++ urllib2.py 5 Feb 2005 14:37:06 -0000 1.80 @@ -304,10 +304,13 @@ self.handle_error[protocol] = lookup elif condition == "open": kind = protocol - lookup = getattr(self, "handle_"+condition) - elif condition in ["response", "request"]: + lookup = self.handle_open + elif condition == "response": kind = protocol - lookup = getattr(self, "process_"+condition) + lookup = self.process_response + elif condition == "request": + kind = protocol + lookup = self.process_request else: continue

1 0

python/dist/src/Lib cookielib.py,1.4,1.4.2.1
by rhettinger＠users.sourceforge.net Feb. 5, 2005

Feb. 5, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15465 Modified Files: Tag: release24-maint cookielib.py Log Message: SF patch #1116583: NameError in cookielib domain check Index: cookielib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cookielib.py,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- cookielib.py 17 Oct 2004 16:23:52 -0000 1.4 +++ cookielib.py 5 Feb 2005 01:33:16 -0000 1.4.2.1 @@ -1134,11 +1134,10 @@ # having to load lots of MSIE cookie files unless necessary. req_host, erhn = eff_request_host(request) if not req_host.startswith("."): - dotted_req_host = "."+req_host + req_host = "."+req_host if not erhn.startswith("."): - dotted_erhn = "."+erhn - if not (dotted_req_host.endswith(domain) or - dotted_erhn.endswith(domain)): + erhn = "."+erhn + if not (req_host.endswith(domain) or erhn.endswith(domain)): #debug(" request domain %s does not match cookie domain %s", # req_host, domain) return False

1 0

python/dist/src/Lib cookielib.py,1.4,1.5
by rhettinger＠users.sourceforge.net Feb. 5, 2005

Feb. 5, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15146/Lib Modified Files: cookielib.py Log Message: SF patch #1116583: NameError in cookielib domain check Index: cookielib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cookielib.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cookielib.py 17 Oct 2004 16:23:52 -0000 1.4 +++ cookielib.py 5 Feb 2005 01:31:17 -0000 1.5 @@ -1134,11 +1134,10 @@ # having to load lots of MSIE cookie files unless necessary. req_host, erhn = eff_request_host(request) if not req_host.startswith("."): - dotted_req_host = "."+req_host + req_host = "."+req_host if not erhn.startswith("."): - dotted_erhn = "."+erhn - if not (dotted_req_host.endswith(domain) or - dotted_erhn.endswith(domain)): + erhn = "."+erhn + if not (req_host.endswith(domain) or erhn.endswith(domain)): #debug(" request domain %s does not match cookie domain %s", # req_host, domain) return False

1 0