Mailman 3 December 2006 - Python-checkins

r53203 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/package_index.py
by phillip.eby 30 Dec '06

30 Dec '06

Author: phillip.eby Date: Sat Dec 30 17:05:41 2006 New Revision: 53203 Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt sandbox/branches/setuptools-0.6/setuptools/package_index.py Log: Add Basic Auth support for http URLs with embedded credentials. If an authenticated page contains links to the same protocol and host, those links should inherit the same credentials. (backport from trunk) Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt ============================================================================== --- sandbox/branches/setuptools-0.6/EasyInstall.txt (original) +++ sandbox/branches/setuptools-0.6/EasyInstall.txt Sat Dec 30 17:05:41 2006 @@ -1195,6 +1195,11 @@ ============================ 0.6c4 + * Added support for HTTP "Basic" authentication using ``http://user:pass@host`` + URLs. If a password-protected page contains links to the same host (and + protocol), those links will inherit the credentials used to access the + original page. + * Removed all special support for Sourceforge mirrors, as Sourceforge's mirror system now works well for non-browser downloads. Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/package_index.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/package_index.py Sat Dec 30 17:05:41 2006 @@ -576,9 +576,7 @@ if url.startswith('file:'): return local_open(url) try: - request = urllib2.Request(url) - request.add_header('User-Agent', user_agent) - return urllib2.urlopen(request) + return open_with_auth(url) except urllib2.HTTPError, v: return v except urllib2.URLError, v: @@ -613,6 +611,8 @@ def scan_url(self, url): self.process_url(url, True) + + def _attempt_download(self, url, filename): headers = self._download_to(url, filename) if 'html' in headers['content-type'].lower(): @@ -654,6 +654,47 @@ +def open_with_auth(url): + """Open a urllib2 request, handling HTTP authentication""" + + scheme, netloc, path, params, query, frag = urlparse.urlparse(url) + + if scheme in ('http', 'https'): + auth, host = urllib2.splituser(netloc) + else: + auth = None + + if auth: + auth = "Basic " + urllib2.unquote(auth).encode('base64').strip() + new_url = urlparse.urlunparse((scheme,host,path,params,query,frag)) + request = urllib2.Request(new_url) + request.add_header("Authorization", auth) + else: + request = urllib2.Request(url) + + request.add_header('User-Agent', user_agent) + fp = urllib2.urlopen(request) + + if auth: + # Put authentication info back into request URL if same host, + # so that links found on the page will work + s2, h2, path2, param2, query2, frag2 = urlparse.urlparse(fp.url) + if s2==scheme and h2==host: + fp.url = urlparse.urlunparse((s2,netloc,path2,param2,query2,frag2)) + + return fp + + + + + + + + + + + + def fix_sf_url(url): return url # backward compatibility

1 0

r53202 - sandbox/trunk/setuptools/setuptools/package_index.py
by phillip.eby 30 Dec '06

30 Dec '06

Author: phillip.eby Date: Sat Dec 30 17:03:14 2006 New Revision: 53202 Modified: sandbox/trunk/setuptools/setuptools/package_index.py Log: Add Basic Auth support for http URLs with embedded credentials. If an authenticated page contains links to the same protocol and host, those links should inherit the same credentials. Modified: sandbox/trunk/setuptools/setuptools/package_index.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/package_index.py (original) +++ sandbox/trunk/setuptools/setuptools/package_index.py Sat Dec 30 17:03:14 2006 @@ -576,9 +576,7 @@ if url.startswith('file:'): return local_open(url) try: - request = urllib2.Request(url) - request.add_header('User-Agent', user_agent) - return urllib2.urlopen(request) + return open_with_auth(url) except urllib2.HTTPError, v: return v except urllib2.URLError, v: @@ -613,6 +611,8 @@ def scan_url(self, url): self.process_url(url, True) + + def _attempt_download(self, url, filename): headers = self._download_to(url, filename) if 'html' in headers['content-type'].lower(): @@ -654,6 +654,47 @@ +def open_with_auth(url): + """Open a urllib2 request, handling HTTP authentication""" + + scheme, netloc, path, params, query, frag = urlparse.urlparse(url) + + if scheme in ('http', 'https'): + auth, host = urllib2.splituser(netloc) + else: + auth = None + + if auth: + auth = "Basic " + urllib2.unquote(auth).encode('base64').strip() + new_url = urlparse.urlunparse((scheme,host,path,params,query,frag)) + request = urllib2.Request(new_url) + request.add_header("Authorization", auth) + else: + request = urllib2.Request(url) + + request.add_header('User-Agent', user_agent) + fp = urllib2.urlopen(request) + + if auth: + # Put authentication info back into request URL if same host, + # so that links found on the page will work + s2, h2, path2, param2, query2, frag2 = urlparse.urlparse(fp.url) + if s2==scheme and h2==host: + fp.url = urlparse.urlunparse((s2,netloc,path2,param2,query2,frag2)) + + return fp + + + + + + + + + + + + def fix_sf_url(url): return url # backward compatibility

1 0

r53201 - peps/trunk/pep-0362.txt
by brett.cannon 29 Dec '06

29 Dec '06

Author: brett.cannon Date: Sat Dec 30 07:17:05 2006 New Revision: 53201 Modified: peps/trunk/pep-0362.txt Log: Add mention of PEP 3107. Also clean up grammar and typos. Finally, add some open issues to work out. Modified: peps/trunk/pep-0362.txt ============================================================================== --- peps/trunk/pep-0362.txt (original) +++ peps/trunk/pep-0362.txt Sat Dec 30 07:17:05 2006 @@ -17,10 +17,10 @@ Python has always supported powerful introspection capabilities, including that for functions and methods (for the rest of this PEP the word "function" refers to both functions and methods). Taking a -function object, you can fully reconstruct the function signature +function object, you can fully reconstruct the function's signature using ``func_defaults``, ``func_code.co_argcount``, ``func_code.co_flags``, and ``func_code.co_varnames``. Unfortunately -this is a little unruly having to look at four different attributes +it is a little unruly having to look at four different attributes to pull together complete information for a function's signature. This PEP proposes an object representation for function signatures. @@ -34,9 +34,9 @@ ================ The overall signature of an object is represented by the Signature -object. This object is to store Parameter objects (discussed later) -along with any information about the function itself and any -parameters that are highly unique (.e.g, ``*args``). +object. This object is to store a `Parameter Object`_ for each +parameter in the signature. It is also to store any information +about the function itself that is pertinent to the signature. A Signature object has the following structure attributes: @@ -46,26 +46,24 @@ contained within. This makes functions and methods indistinguishable from one another when passed to decorators, preventing proper creation of a fully qualified name. - indistinguishable from * var_args:str - Name of the ``*args`` parameter, if present, else the empty + Name of the ``*args`` parameter, if present, or the empty string. * var_kw_args:str - Name of the ``**kwargs`` parameter, if present, else the empty + Name of the ``**kwargs`` parameter, if present, or the empty string. * parameters:list(Parameter) - List of the parameters of the function are represented by - Parameter objects (see `Parameter Object`_ for their - description). + List of the parameters of the function as represented by + Parameter objects (see `Parameter Object`_). * __str__() -> str Return the string representation of the signature as it might appear in source code. * bind(\*args, \*\*kwargs) -> dict - Create a mapping from parameter to argument for the signature (see - `Open Issues`_ for question of how to handle tuples). + Create a mapping from parameter to argument for the signature. The Signature object is stored in the ``__signature__`` attribute of -the function. When it is to be created is an `Open Issues`_. +the function. When it is to be created is discussed in +`Open Issues`_. Parameter Object @@ -122,10 +120,10 @@ way if the argument can be unpacked. -Relation With Other PEPs -======================== +Relation To Other PEPs +====================== -"Keyword-Only Arguments [#pep-3102]_ +Keyword-Only Arguments [#pep-3102]_ ------------------------------------ If keyword-only parameters come into existence, the Parameter object @@ -139,7 +137,26 @@ attribute that are in no way compatible. It also removes the ability to know the position number within the signature from the Paramter object itself. Plus Guido preferred the original approach over this -alternative. +alternative. This does mean, though, that how to set the position of +an argument when ``*args`` is not at the end of the parameter list. + + +Function Annotations [#pep-3107]_ +---------------------------------- + +Support needs to be added for function annotations. One option is to +have two new attributes for each Parameter object: ``has_annotation`` +and ``annotation``. This would remove any possible ambiguity in +terms of what an annotation could be. + +But one could argue that the chances of someone setting an annotation +to ``None`` is very low and thus allows it to be used as a value +for a single ``annotation`` attribute to signify that no annotation +was set. But there is the slight issue of breaking from consistency +compared to ``has_default``/``default_value``. + +Regardless of which approach is taken, Signature objects will also +need to gain support for annotations for ``*args`` and ``**kwargs``. Open Issues @@ -177,6 +194,28 @@ that the binding could not be calculated with full confidence. +How should ``Signature.bind`` handle ``*args`` and ``**kwargs``? +------------------------------------------------------------------ + +There are two possible approaches to how ``*args`` and ``**kwargs`` +should be returned by ``Signature.bind``. One is to have their +names as keys in the dictionary and their values be the list and +dictionary that would be created. Another is to have ``bind`` +return a three-item tuple of the parameters and their values, what +the ``*args`` value would be bound to, and a dict of what +``**kwargs`` would be set to. + + +Should ``Signature.bind`` return Parameter objects as keys? +----------------------------------------------------------- + +Instead of returning a dict with keys consisting of the name of the +parameters, would it be more useful to instead return Parameter +objects? The name of the argument can easily be retrieved. It also +removes any need of having to map parameter name to the Parameter +object if that is desired. + + References ========== @@ -189,6 +228,9 @@ .. [#impl] Implementation of PEP 362 (http://www.python.org/sf/1544909) +.. [#pep-3107] Function Annotations + (http://www.python.org/dev/peps/pep-3107/) + Copyright =========

1 0

r53200 - in python/trunk: Lib/test/test_set.py Objects/setobject.c
by raymond.hettinger 29 Dec '06

29 Dec '06

Author: raymond.hettinger Date: Sat Dec 30 05:01:17 2006 New Revision: 53200 Modified: python/trunk/Lib/test/test_set.py python/trunk/Objects/setobject.c Log: For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. Modified: python/trunk/Lib/test/test_set.py ============================================================================== --- python/trunk/Lib/test/test_set.py (original) +++ python/trunk/Lib/test/test_set.py Sat Dec 30 05:01:17 2006 @@ -21,6 +21,11 @@ def __cmp__(self, other): raise RuntimeError +class ReprWrapper: + 'Used to test self-referential repr() calls' + def __repr__(self): + return repr(self.value) + class TestJointOps(unittest.TestCase): # Tests common to both set and frozenset @@ -244,6 +249,27 @@ self.assertRaises(RuntimeError, s.discard, BadCmp()) self.assertRaises(RuntimeError, s.remove, BadCmp()) + def test_cyclical_repr(self): + w = ReprWrapper() + s = self.thetype([w]) + w.value = s + name = repr(s).partition('(')[0] # strip class name from repr string + self.assertEqual(repr(s), '%s([%s(...)])' % (name, name)) + + def test_cyclical_print(self): + w = ReprWrapper() + s = self.thetype([w]) + w.value = s + try: + fo = open(test_support.TESTFN, "wb") + print >> fo, s, + fo.close() + fo = open(test_support.TESTFN, "rb") + self.assertEqual(fo.read(), repr(s)) + finally: + fo.close() + os.remove(test_support.TESTFN) + class TestSet(TestJointOps): thetype = set Modified: python/trunk/Objects/setobject.c ============================================================================== --- python/trunk/Objects/setobject.c (original) +++ python/trunk/Objects/setobject.c Sat Dec 30 05:01:17 2006 @@ -572,34 +572,54 @@ Py_ssize_t pos=0; char *emit = ""; /* No separator emitted on first pass */ char *separator = ", "; + int status = Py_ReprEnter((PyObject*)so); + + if (status != 0) { + if (status < 0) + return status; + fprintf(fp, "%s(...)", so->ob_type->tp_name); + return 0; + } fprintf(fp, "%s([", so->ob_type->tp_name); while (set_next(so, &pos, &entry)) { fputs(emit, fp); emit = separator; - if (PyObject_Print(entry->key, fp, 0) != 0) + if (PyObject_Print(entry->key, fp, 0) != 0) { + Py_ReprLeave((PyObject*)so); return -1; + } } fputs("])", fp); + Py_ReprLeave((PyObject*)so); return 0; } static PyObject * set_repr(PySetObject *so) { - PyObject *keys, *result, *listrepr; + PyObject *keys, *result=NULL, *listrepr; + int status = Py_ReprEnter((PyObject*)so); + + if (status != 0) { + if (status < 0) + return NULL; + return PyString_FromFormat("%s(...)", so->ob_type->tp_name); + } keys = PySequence_List((PyObject *)so); if (keys == NULL) - return NULL; + goto done; listrepr = PyObject_Repr(keys); Py_DECREF(keys); if (listrepr == NULL) - return NULL; + goto done; result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name, PyString_AS_STRING(listrepr)); Py_DECREF(listrepr); +done: + Py_ReprLeave((PyObject*)so); return result; }

1 0

r53199 - sandbox/branches/setuptools-0.6/setuptools/sandbox.py
by phillip.eby 29 Dec '06

29 Dec '06

Author: phillip.eby Date: Sat Dec 30 04:06:57 2006 New Revision: 53199 Modified: sandbox/branches/setuptools-0.6/setuptools/sandbox.py Log: Fix os.open() sandboxing code that refused anything but read-only access. (backport from trunk) Modified: sandbox/branches/setuptools-0.6/setuptools/sandbox.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/sandbox.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/sandbox.py Sat Dec 30 04:06:57 2006 @@ -189,8 +189,8 @@ def open(self, file, flags, mode=0777): """Called for low-level os.open()""" - if flags & WRITE_FLAGS: - self._violation("open", file, flags, mode) + if flags & WRITE_FLAGS and not self._ok(file): + self._violation("os.open", file, flags, mode) return _os.open(file,flags,mode)

1 0

r53198 - sandbox/trunk/setuptools/setuptools/sandbox.py
by phillip.eby 29 Dec '06

29 Dec '06

Author: phillip.eby Date: Sat Dec 30 04:06:09 2006 New Revision: 53198 Modified: sandbox/trunk/setuptools/setuptools/sandbox.py Log: Fix os.open() sandboxing code that refused anything but read-only access. Modified: sandbox/trunk/setuptools/setuptools/sandbox.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/sandbox.py (original) +++ sandbox/trunk/setuptools/setuptools/sandbox.py Sat Dec 30 04:06:09 2006 @@ -189,8 +189,8 @@ def open(self, file, flags, mode=0777): """Called for low-level os.open()""" - if flags & WRITE_FLAGS: - self._violation("open", file, flags, mode) + if flags & WRITE_FLAGS and not self._ok(file): + self._violation("os.open", file, flags, mode) return _os.open(file,flags,mode)

1 0

r53190 - in python/branches/release25-maint: Lib/test/test_array.py Misc/ACKS Modules/arraymodule.c
by thomas.wouters 29 Dec '06

29 Dec '06

Author: thomas.wouters Date: Fri Dec 29 15:42:17 2006 New Revision: 53190 Modified: python/branches/release25-maint/Lib/test/test_array.py python/branches/release25-maint/Misc/ACKS python/branches/release25-maint/Modules/arraymodule.c Log: Backport trunk checkin r51565: Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Modified: python/branches/release25-maint/Lib/test/test_array.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_array.py (original) +++ python/branches/release25-maint/Lib/test/test_array.py Fri Dec 29 15:42:17 2006 @@ -85,6 +85,13 @@ self.assertNotEqual(id(a), id(b)) self.assertEqual(a, b) + def test_deepcopy(self): + import copy + a = array.array(self.typecode, self.example) + b = copy.deepcopy(a) + self.assertNotEqual(id(a), id(b)) + self.assertEqual(a, b) + def test_pickle(self): for protocol in (0, 1, 2): a = array.array(self.typecode, self.example) Modified: python/branches/release25-maint/Misc/ACKS ============================================================================== --- python/branches/release25-maint/Misc/ACKS (original) +++ python/branches/release25-maint/Misc/ACKS Fri Dec 29 15:42:17 2006 @@ -242,6 +242,7 @@ Michael Guravage Lars Gust�bel Barry Haddow +V�clav Haisman Paul ten Hagen Rasmus Hahn Peter Haight Modified: python/branches/release25-maint/Modules/arraymodule.c ============================================================================== --- python/branches/release25-maint/Modules/arraymodule.c (original) +++ python/branches/release25-maint/Modules/arraymodule.c Fri Dec 29 15:42:17 2006 @@ -1495,7 +1495,7 @@ copy_doc}, {"count", (PyCFunction)array_count, METH_O, count_doc}, - {"__deepcopy__",(PyCFunction)array_copy, METH_NOARGS, + {"__deepcopy__",(PyCFunction)array_copy, METH_O, copy_doc}, {"extend", (PyCFunction)array_extend, METH_O, extend_doc},

4 3

r53110 - python/trunk/Lib/mailbox.py
by andrew.kuchling 29 Dec '06

29 Dec '06

Author: andrew.kuchling Date: Wed Dec 20 20:48:20 2006 New Revision: 53110 Modified: python/trunk/Lib/mailbox.py Log: [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. Modified: python/trunk/Lib/mailbox.py ============================================================================== --- python/trunk/Lib/mailbox.py (original) +++ python/trunk/Lib/mailbox.py Wed Dec 20 20:48:20 2006 @@ -513,6 +513,7 @@ self._next_key = 0 self._pending = False # No changes require rewriting the file. self._locked = False + self._file_length = None # Used to record mailbox size def add(self, message): """Add message and return assigned key.""" @@ -566,7 +567,21 @@ """Write any pending changes to disk.""" if not self._pending: return - self._lookup() + + # In order to be writing anything out at all, self._toc must + # already have been generated (and presumably has been modified + # by adding or deleting an item). + assert self._toc is not None + + # Check length of self._file; if it's changed, some other process + # has modified the mailbox since we scanned it. + self._file.seek(0, 2) + cur_len = self._file.tell() + if cur_len != self._file_length: + raise ExternalClashError('Size of mailbox file changed ' + '(expected %i, found %i)' % + (self._file_length, cur_len)) + new_file = _create_temporary(self._path) try: new_toc = {} @@ -642,6 +657,7 @@ offsets = self._install_message(message) self._post_message_hook(self._file) self._file.flush() + self._file_length = self._file.tell() # Record current length of mailbox return offsets @@ -733,6 +749,7 @@ break self._toc = dict(enumerate(zip(starts, stops))) self._next_key = len(self._toc) + self._file_length = self._file.tell() class MMDF(_mboxMMDF): @@ -776,6 +793,8 @@ break self._toc = dict(enumerate(zip(starts, stops))) self._next_key = len(self._toc) + self._file.seek(0, 2) + self._file_length = self._file.tell() class MH(Mailbox): @@ -1201,7 +1220,9 @@ self._toc = dict(enumerate(zip(starts, stops))) self._labels = dict(enumerate(label_lists)) self._next_key = len(self._toc) - + self._file.seek(0, 2) + self._file_length = self._file.tell() + def _pre_mailbox_hook(self, f): """Called before writing the mailbox to file f.""" f.write('BABYL OPTIONS:%sVersion: 5%sLabels:%s%s\037' %

7 9

r53197 - in python/branches/release25-maint: Lib/test/test_set.py Misc/NEWS Objects/setobject.c
by raymond.hettinger 29 Dec '06

29 Dec '06

Author: raymond.hettinger Date: Fri Dec 29 19:49:13 2006 New Revision: 53197 Modified: python/branches/release25-maint/Lib/test/test_set.py python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Objects/setobject.c Log: For sets with cyclical reprs, emit '...' instead of recursing. Modified: python/branches/release25-maint/Lib/test/test_set.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_set.py (original) +++ python/branches/release25-maint/Lib/test/test_set.py Fri Dec 29 19:49:13 2006 @@ -21,6 +21,11 @@ def __cmp__(self, other): raise RuntimeError +class ReprWrapper: + 'Used to test self-referential repr() calls' + def __repr__(self): + return repr(self.value) + class TestJointOps(unittest.TestCase): # Tests common to both set and frozenset @@ -244,6 +249,27 @@ self.assertRaises(RuntimeError, s.discard, BadCmp()) self.assertRaises(RuntimeError, s.remove, BadCmp()) + def test_cyclical_repr(self): + w = ReprWrapper() + s = self.thetype([w]) + w.value = s + name = repr(s).partition('(')[0] # strip class name from repr string + self.assertEqual(repr(s), '%s([%s(...)])' % (name, name)) + + def test_cyclical_print(self): + w = ReprWrapper() + s = self.thetype([w]) + w.value = s + try: + fo = open(test_support.TESTFN, "wb") + print >> fo, s, + fo.close() + fo = open(test_support.TESTFN, "rb") + self.assertEqual(fo.read(), repr(s)) + finally: + fo.close() + os.remove(test_support.TESTFN) + class TestSet(TestJointOps): thetype = set Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Fri Dec 29 19:49:13 2006 @@ -18,6 +18,9 @@ custom ``__eq__()`` method to confuse set internals when class instances were used as a set's elements and the ``__eq__()`` method mutated the set. +- The repr for self-referential sets and fronzensets now shows "..." instead + of falling into infinite recursion. + - Eliminated unnecessary repeated calls to hash() by set.intersection() and set.symmetric_difference_update(). Modified: python/branches/release25-maint/Objects/setobject.c ============================================================================== --- python/branches/release25-maint/Objects/setobject.c (original) +++ python/branches/release25-maint/Objects/setobject.c Fri Dec 29 19:49:13 2006 @@ -572,34 +572,54 @@ Py_ssize_t pos=0; char *emit = ""; /* No separator emitted on first pass */ char *separator = ", "; + int status = Py_ReprEnter((PyObject*)so); + + if (status != 0) { + if (status < 0) + return status; + fprintf(fp, "%s(...)", so->ob_type->tp_name); + return 0; + } fprintf(fp, "%s([", so->ob_type->tp_name); while (set_next(so, &pos, &entry)) { fputs(emit, fp); emit = separator; - if (PyObject_Print(entry->key, fp, 0) != 0) + if (PyObject_Print(entry->key, fp, 0) != 0) { + Py_ReprLeave((PyObject*)so); return -1; + } } fputs("])", fp); + Py_ReprLeave((PyObject*)so); return 0; } static PyObject * set_repr(PySetObject *so) { - PyObject *keys, *result, *listrepr; + PyObject *keys, *result=NULL, *listrepr; + int status = Py_ReprEnter((PyObject*)so); + + if (status != 0) { + if (status < 0) + return NULL; + return PyString_FromFormat("%s(...)", so->ob_type->tp_name); + } keys = PySequence_List((PyObject *)so); if (keys == NULL) - return NULL; + goto done; listrepr = PyObject_Repr(keys); Py_DECREF(keys); if (listrepr == NULL) - return NULL; + goto done; result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name, PyString_AS_STRING(listrepr)); Py_DECREF(listrepr); +done: + Py_ReprLeave((PyObject*)so); return result; }

1 0

r53196 - in sandbox/branches/setuptools-0.6: setup.py setuptools/command/easy_install.py
by phillip.eby 29 Dec '06

29 Dec '06

Author: phillip.eby Date: Fri Dec 29 18:51:27 2006 New Revision: 53196 Modified: sandbox/branches/setuptools-0.6/setup.py sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py Log: Switch default package-index to cheeseshop.python.org, and make setuptools' home page its cheeseshop page. (backport from trunk) Modified: sandbox/branches/setuptools-0.6/setup.py ============================================================================== --- sandbox/branches/setuptools-0.6/setup.py (original) +++ sandbox/branches/setuptools-0.6/setup.py Fri Dec 29 18:51:27 2006 @@ -23,7 +23,7 @@ license="PSF or ZPL", long_description = open('README.txt').read(), keywords = "CPAN PyPI distutils eggs package management", - url = "http://peak.telecommunity.com/DevCenter/setuptools", + url = "http://cheeseshop.python.org/pypi/setuptools", test_suite = 'setuptools.tests', packages = find_packages(), package_data = {'setuptools':['*.exe']}, Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py Fri Dec 29 18:51:27 2006 @@ -156,7 +156,7 @@ else: self.all_site_dirs.append(normalize_path(d)) if not self.editable: self.check_site_dir() - self.index_url = self.index_url or "http://www.python.org/pypi" + self.index_url = self.index_url or "http://cheeseshop.python.org/pypi" self.shadow_path = self.all_site_dirs[:] for path_item in self.install_dir, normalize_path(self.script_dir): if path_item not in self.shadow_path:

1 0