Mailman 3 May 2007 - Python-checkins

r55711 - in sandbox/trunk/setuptools: EasyInstall.txt pkg_resources.py setuptools.txt setuptools/__init__.py setuptools/package_index.py
by phillip.eby 31 May '07

31 May '07

Author: phillip.eby Date: Thu May 31 19:20:56 2007 New Revision: 55711 Modified: sandbox/trunk/setuptools/EasyInstall.txt sandbox/trunk/setuptools/pkg_resources.py sandbox/trunk/setuptools/setuptools.txt sandbox/trunk/setuptools/setuptools/__init__.py sandbox/trunk/setuptools/setuptools/package_index.py Log: Misc. fixes: * Don't treat directories with a '.' in the name as packages * Don't include ez_setup in find_packages() * HTML-decode URLs scraped from web pages (d'oh!) * Fix cache dir defaults on Windows when multiple env vars used * Doc updates Modified: sandbox/trunk/setuptools/EasyInstall.txt ============================================================================== --- sandbox/trunk/setuptools/EasyInstall.txt (original) +++ sandbox/trunk/setuptools/EasyInstall.txt Thu May 31 19:20:56 2007 @@ -442,6 +442,19 @@ below, and also the section on `Package Index "API"`_. +Password-Protected Sites +------------------------ + +If a site you want to download from is password-protected using HTTP "Basic" +authentication, you can specify your credentials in the URL, like so:: + + http://some_userid:some_password@some.example.com/some_path/ + +You can do this with both index page URLs and direct download URLs. As long +as any HTML pages read by easy_install use *relative* links to point to the +downloads, the same user ID and password will be used to do the downloading. + + Controlling Build Options ~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: sandbox/trunk/setuptools/pkg_resources.py ============================================================================== --- sandbox/trunk/setuptools/pkg_resources.py (original) +++ sandbox/trunk/setuptools/pkg_resources.py Thu May 31 19:20:56 2007 @@ -1052,7 +1052,7 @@ dirname = '' for key in keys: if key in os.environ: - dirname = os.path.join(os.environ[key]) + dirname = os.path.join(dirname, os.environ[key]) else: break else: Modified: sandbox/trunk/setuptools/setuptools.txt ============================================================================== --- sandbox/trunk/setuptools/setuptools.txt (original) +++ sandbox/trunk/setuptools/setuptools.txt Thu May 31 19:20:56 2007 @@ -1463,8 +1463,10 @@ you use any option at all. (By the way, if you're using some other revision control system, you might -consider submitting a patch to the ``setuptools.command.sdist`` module, -so we can include support for your system.) +consider creating and publishing a `revision control plugin for setuptools`_.) + + +.. _revision control plugin for setuptools: `Adding Support for Other Revision Control Systems`_ Making your package available for EasyInstall Modified: sandbox/trunk/setuptools/setuptools/__init__.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/__init__.py (original) +++ sandbox/trunk/setuptools/setuptools/__init__.py Thu May 31 19:20:56 2007 @@ -30,11 +30,11 @@ where,prefix = stack.pop(0) for name in os.listdir(where): fn = os.path.join(where,name) - if (os.path.isdir(fn) and + if ('.' not in name and os.path.isdir(fn) and os.path.isfile(os.path.join(fn,'__init__.py')) ): out.append(prefix+name); stack.append((fn,prefix+name+'.')) - for pat in exclude: + for pat in list(exclude)+['ez_setup']: from fnmatch import fnmatchcase out = [item for item in out if not fnmatchcase(item,pat)] return out Modified: sandbox/trunk/setuptools/setuptools/package_index.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/package_index.py (original) +++ sandbox/trunk/setuptools/setuptools/package_index.py Thu May 31 19:20:56 2007 @@ -132,14 +132,14 @@ rels = map(str.strip, rel.lower().split(',')) if 'homepage' in rels or 'download' in rels: for match in HREF.finditer(tag): - yield urlparse.urljoin(url, match.group(1)) + yield urlparse.urljoin(url, htmldecode(match.group(1))) for tag in ("<th>Home Page", "<th>Download URL"): pos = page.find(tag) if pos!=-1: match = HREF.search(page,pos) if match: - yield urlparse.urljoin(url, match.group(1)) + yield urlparse.urljoin(url, htmldecode(match.group(1))) user_agent = "Python-urllib/%s setuptools/%s" % ( urllib2.__version__, require('setuptools')[0].version @@ -200,7 +200,7 @@ if url.startswith(self.index_url) and getattr(f,'code',None)!=404: page = self.process_index(url, page) for match in HREF.finditer(page): - link = urlparse.urljoin(base, match.group(1)) + link = urlparse.urljoin(base, htmldecode(match.group(1))) self.process_url(link) def process_filename(self, fn, nested=False): @@ -262,7 +262,7 @@ # process an index page into the package-page index for match in HREF.finditer(page): - scan( urlparse.urljoin(url, match.group(1)) ) + scan( urlparse.urljoin(url, htmldecode(match.group(1))) ) pkg, ver = scan(url) # ensure this page is in the page index if pkg: @@ -611,6 +611,8 @@ self.url_ok(url, True) # raises error if not allowed return self._attempt_download(url, filename) + + def scan_url(self, url): self.process_url(url, True) @@ -652,6 +654,44 @@ def warn(self, msg, *args): log.warn(msg, *args) +# This pattern matches a character entity reference (a decimal numeric +# references, a hexadecimal numeric reference, or a named reference). +entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub + +def uchr(c): + if not isinstance(c, int): + return c + if c>255: return unichr(c) + return chr(c) + +def decode_entity(match): + what = match.group(1) + if what.startswith('#x'): + what = int(what[2:], 16) + elif what.startswith('#'): + what = int(what[1:]) + else: + from htmlentitydefs import name2codepoint + what = name2codepoint.get(what, match.group(0)) + return uchr(what) + +def htmldecode(text): + """Decode HTML entities in the given text.""" + return entity_sub(decode_entity, text) + + + + + + + + + + + + + +

1 0

r55705 - python/trunk/Doc/lib/libpickle.tex
by neal.norwitz 31 May '07

31 May '07

Author: neal.norwitz Date: Thu May 31 06:14:22 2007 New Revision: 55705 Modified: python/trunk/Doc/lib/libpickle.tex Log: Add some spaces in the example code. Modified: python/trunk/Doc/lib/libpickle.tex ============================================================================== --- python/trunk/Doc/lib/libpickle.tex (original) +++ python/trunk/Doc/lib/libpickle.tex Thu May 31 06:14:22 2007 @@ -799,7 +799,7 @@ del odict['fh'] # remove filehandle entry return odict - def __setstate__(self,dict): + def __setstate__(self, dict): fh = open(dict['file']) # reopen file count = dict['lineno'] # read from file... while count: # until line count is restored @@ -820,7 +820,7 @@ ... obj.readline() '7: class TextReader:' >>> import pickle ->>> pickle.dump(obj,open('save.p','w')) +>>> pickle.dump(obj,open('save.p', 'wb')) \end{verbatim} If you want to see that \refmodule{pickle} works across Python @@ -829,7 +829,7 @@ \begin{verbatim} >>> import pickle ->>> reader = pickle.load(open('save.p')) +>>> reader = pickle.load(open('save.p', 'rb')) >>> reader.readline() '8: "Print and number lines in a text file."' \end{verbatim}

1 0

r55704 - python/branches/bcannon-objcap/secure_python.c
by brett.cannon 31 May '07

31 May '07

Author: brett.cannon Date: Thu May 31 02:36:51 2007 New Revision: 55704 Modified: python/branches/bcannon-objcap/secure_python.c Log: Clear sys.meta_path and sys.path_hooks. Modified: python/branches/bcannon-objcap/secure_python.c ============================================================================== --- python/branches/bcannon-objcap/secure_python.c (original) +++ python/branches/bcannon-objcap/secure_python.c Thu May 31 02:36:51 2007 @@ -22,6 +22,7 @@ int return_val; PyInterpreterState *interp; Py_ssize_t module_count, x; + PyObject *obj; PyObject *module_names_list; PyObject *hidden_modules; PyObject *import_module; @@ -52,12 +53,24 @@ /* Initialize interpreter. */ Py_Initialize(); + interp = PyThreadState_GET()->interp; + + /* Clear sys.meta_path and sys.path_hooks. + This needs to be done before importlib is called as it sets values in + both attributes. */ + obj = PyDict_GetItemString(interp->sysdict, "meta_path"); + x = PyList_Size(obj); + PyList_SetSlice(obj, 0, x, NULL); + + obj = PyDict_GetItemString(interp->sysdict, "path_hooks"); + x = PyList_Size(obj); + PyList_SetSlice(obj, 0, x, NULL); + /* Create lists of modules safe to import. */ CREATE_SAFE_LIST(builtins); CREATE_SAFE_LIST(frozen); CREATE_SAFE_LIST(extensions); - interp = PyThreadState_GET()->interp; /* Get importer from importlib. */ import_module = PyImport_ImportModule("controlled_importlib");

1 0

r55703 - python/branches/cpy_merge/Lib/test/test_string_io.py
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Date: Thu May 31 01:52:00 2007 New Revision: 55703 Added: python/branches/cpy_merge/Lib/test/test_string_io.py Log: Add a temporary unit test for _string_io. Added: python/branches/cpy_merge/Lib/test/test_string_io.py ============================================================================== --- (empty file) +++ python/branches/cpy_merge/Lib/test/test_string_io.py Thu May 31 01:52:00 2007 @@ -0,0 +1,132 @@ +"""Temporary unit tests for StringIO""" + +# Based on test_StringIO.py + +import unittest +import _string_io +import types +from test import test_support + + +class TestGenericStringIO(unittest.TestCase): + # use a class variable MODULE to define which module is being tested + + # Line of data to test as string + _line = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!' + + # Constructor to use for the test data (._line is passed to this + # constructor) + constructor = unicode + + def setUp(self): + self._line = self.constructor(self._line) + self._lines = self.constructor((self._line + '\n') * 5) + self._fp = self.MODULE.StringIO(self._lines) + + def test_reads(self): + eq = self.assertEqual + self.assertRaises(TypeError, self._fp.seek) + eq(self._fp.read(10), self._line[:10]) + eq(self._fp.readline(), self._line[10:] + '\n') + eq(len(self._fp.readlines(60)), 2) + + def test_writes(self): + f = self.MODULE.StringIO() + self.assertRaises(TypeError, f.seek) + f.write(self._line[:6]) + f.seek(3) + f.write(self._line[20:26]) + f.write(self._line[52]) + self.assertEqual(f.getvalue(), u'abcuvwxyz!') + + def test_writelines(self): + f = self.MODULE.StringIO() + f.writelines(map(self.constructor, [self._line[0], self._line[1], self._line[2]])) + f.seek(0) + self.assertEqual(f.getvalue(), u'abc') + + def test_writelines_error(self): + def errorGen(): + yield u'a' + raise KeyboardInterrupt() + f = self.MODULE.StringIO() + self.assertRaises(KeyboardInterrupt, f.writelines, errorGen()) + + def test_truncate(self): + eq = self.assertEqual + f = self.MODULE.StringIO() + f.write(self._lines) + f.seek(10) + f.truncate() + eq(f.getvalue(), u'abcdefghij') + f.truncate(5) + eq(f.getvalue(), u'abcde') + f.write(u'xyz') + eq(f.getvalue(), u'abcdexyz') + self.assertRaises(IOError, f.truncate, -1) + f.close() + self.assertRaises(ValueError, f.write, u'frobnitz') + + def test_closed_flag(self): + f = self.MODULE.StringIO() + self.assertEqual(f.closed, False) + f.close() + self.assertEqual(f.closed, True) + f = self.MODULE.StringIO(u"abc") + self.assertEqual(f.closed, False) + f.close() + self.assertEqual(f.closed, True) + + def test_isatty(self): + f = self.MODULE.StringIO() + self.assertRaises(TypeError, f.isatty, None) + self.assertEqual(f.isatty(), False) + f.close() + self.assertRaises(ValueError, f.isatty) + + def test_iterator(self): + eq = self.assertEqual + unless = self.failUnless + eq(iter(self._fp), self._fp) + # Does this object support the iteration protocol? + unless(hasattr(self._fp, '__iter__')) + unless(hasattr(self._fp, '__next__')) + i = 0 + for line in self._fp: + eq(line, self._line + '\n') + i += 1 + eq(i, 5) + self._fp.close() + self.assertRaises(ValueError, next, self._fp) + + def test_getvalue(self): + f = self.MODULE.StringIO() + f.close() + self.assertRaises(ValueError, f.getvalue) + +class TestStringIO(TestGenericStringIO): + MODULE = _string_io + + def test_unicode(self): + + if not test_support.have_unicode: return + + # The StringIO module also supports concatenating Unicode + # snippets to larger Unicode strings. This is tested by this + # method. + + f = self.MODULE.StringIO() + f.write(self._line[:6]) + f.seek(3) + f.write(unicode(self._line[20:26])) + f.write(unicode(self._line[52])) + s = f.getvalue() + self.assertEqual(s, unicode('abcuvwxyz!')) + self.assertEqual(type(s), types.UnicodeType) + + +def test_main(): + test_support.run_unittest(TestStringIO) + +if __name__ == '__main__': + test_main()

1 0

r55702 - svn:log
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Revision: 55702 Property Name: svn:log New Property Value: Add _string_io to setup.py

1 0

r55702 - python/branches/cpy_merge/setup.py
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Date: Thu May 31 01:47:36 2007 New Revision: 55702 Modified: python/branches/cpy_merge/setup.py Log: Add _string_io to setup.py Add a temporary unit test for _string_io. Modified: python/branches/cpy_merge/setup.py ============================================================================== --- python/branches/cpy_merge/setup.py (original) +++ python/branches/cpy_merge/setup.py Thu May 31 01:47:36 2007 @@ -472,8 +472,9 @@ exts.append( Extension('cStringIO', ['cStringIO.c']) ) exts.append( Extension('cPickle', ['cPickle.c']) ) - # Fast implementation of BytesIO + # Fast implementation of BytesIO and StringIO exts.append( Extension('_bytes_io', ['_bytes_iomodule.c']) ) + exts.append( Extension('_string_io', ['_string_iomodule.c']) ) # Memory-mapped files (also works on Win32). if platform not in ['atheos', 'mac']:

1 0

r55701 - python/branches/cpy_merge/Modules/_bytes_iomodule.c
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Date: Thu May 31 01:36:02 2007 New Revision: 55701 Modified: python/branches/cpy_merge/Modules/_bytes_iomodule.c Log: Rename a few variables. Modified: python/branches/cpy_merge/Modules/_bytes_iomodule.c ============================================================================== --- python/branches/cpy_merge/Modules/_bytes_iomodule.c (original) +++ python/branches/cpy_merge/Modules/_bytes_iomodule.c Thu May 31 01:36:02 2007 @@ -56,7 +56,7 @@ /* Internal routine for writing a string of bytes to the buffer of a BytesIO object. Returns the number of bytes wrote. */ static Py_ssize_t -write_bytes(BytesIOObject *self, const char *c, Py_ssize_t l) +write_bytes(BytesIOObject *self, const char *bytes, Py_ssize_t l) { Py_ssize_t newl; @@ -79,7 +79,7 @@ } } - memcpy(self->buf + self->pos, c, l); + memcpy(self->buf + self->pos, bytes, l); assert(self->pos + l < PY_SSIZE_T_MAX); self->pos += l; @@ -320,16 +320,16 @@ static PyObject * bytes_io_write(BytesIOObject *self, PyObject *args) { - const char *c; - Py_ssize_t l; + const char *bytes; + Py_ssize_t n; if (self->buf == NULL) return err_closed(); - if (!PyArg_ParseTuple(args, "t#:write", &c, &l)) + if (!PyArg_ParseTuple(args, "t#:write", &bytes, &n)) return NULL; - if (write_bytes(self, c, l) == -1) + if (write_bytes(self, bytes, n) == -1) return NULL; Py_RETURN_NONE;

1 0

r55700 - python/branches/cpy_merge/Modules/_string_iomodule.c
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Date: Thu May 31 01:28:06 2007 New Revision: 55700 Modified: python/branches/cpy_merge/Modules/_string_iomodule.c Log: Fix string_io_writelines(). Rename a few variables. Modified: python/branches/cpy_merge/Modules/_string_iomodule.c ============================================================================== --- python/branches/cpy_merge/Modules/_string_iomodule.c (original) +++ python/branches/cpy_merge/Modules/_string_iomodule.c Thu May 31 01:28:06 2007 @@ -56,7 +56,7 @@ /* Internal routine for writing a string of bytes to the buffer of a StringIO object. Returns the number of bytes wrote. */ static Py_ssize_t -write_bytes(StringIOObject *self, const Py_UNICODE *c, Py_ssize_t l) +write_str(StringIOObject *self, const Py_UNICODE *ustr, Py_ssize_t l) { Py_ssize_t newl; @@ -79,7 +79,7 @@ } } - memcpy(self->buf + self->pos, c, l * sizeof(Py_UNICODE)); + memcpy(self->buf + self->pos, ustr, l * sizeof(Py_UNICODE)); assert(self->pos + l < PY_SSIZE_T_MAX); self->pos += l; @@ -320,16 +320,18 @@ static PyObject * string_io_write(StringIOObject *self, PyObject *args) { - const Py_UNICODE *c; - Py_ssize_t l; + const Py_UNICODE *ustr; + Py_ssize_t n; if (self->buf == NULL) return err_closed(); - if (!PyArg_ParseTuple(args, "u#:write", &c, &l)) + if (!PyArg_ParseTuple(args, + "u#;write() may only be called on" + "unicode strings", &ustr, &n)) return NULL; - if (write_bytes(self, c, l) == -1) + if (write_str(self, ustr, n) == -1) return NULL; Py_RETURN_NONE; @@ -349,15 +351,18 @@ while ((item = PyIter_Next(it)) != NULL) { Py_ssize_t n; - Py_UNICODE *c; - if (PyString_AsStringAndSize(item, &c, &n) == -1) { + Py_UNICODE *ustr; + if ((ustr = PyUnicode_AsUnicode(item)) == NULL) { + PyErr_SetString(PyExc_TypeError, + "Need a list of unicode objects"); Py_DECREF(it); Py_DECREF(item); return NULL; } + n = PyUnicode_GetSize(item); Py_DECREF(item); - if (write_bytes(self, c, n) == -1) { + if (write_str(self, ustr, n) == -1) { Py_DECREF(it); return NULL; } @@ -417,7 +422,7 @@ self->string_size = 0; if (n > 0) { - if (write_bytes(self, buf, n) == -1) + if (write_str(self, buf, n) == -1) return NULL; self->pos = 0; }

1 0

r55699 - python/branches/cpy_merge/Modules/_string_iomodule.c
by alexandre.vassalotti 30 May '07

30 May '07

Author: alexandre.vassalotti Date: Thu May 31 00:49:35 2007 New Revision: 55699 Modified: python/branches/cpy_merge/Modules/_string_iomodule.c Log: Fixed memcpy() call. Modified: python/branches/cpy_merge/Modules/_string_iomodule.c ============================================================================== --- python/branches/cpy_merge/Modules/_string_iomodule.c (original) +++ python/branches/cpy_merge/Modules/_string_iomodule.c Thu May 31 00:49:35 2007 @@ -79,7 +79,7 @@ } } - memcpy(self->buf + self->pos, c, l); + memcpy(self->buf + self->pos, c, l * sizeof(Py_UNICODE)); assert(self->pos + l < PY_SSIZE_T_MAX); self->pos += l;

1 0

buildbot warnings in sparc solaris10 gcc trunk
by buildbot＠python.org 30 May '07

30 May '07

The Buildbot has detected a new failure of sparc solaris10 gcc trunk. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%2520solaris10%2520gcc%2520trun… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon Build had warnings: warnings test Excerpt from the test logfile: Traceback (most recent call last): File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/threading.py", line 460, in __bootstrap self.run() File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_socketserver.py", line 93, in run svr.serve_a_few() File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_socketserver.py", line 35, in serve_a_few self.handle_request() File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/SocketServer.py", line 224, in handle_request self.handle_error(request, client_address) File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/SocketServer.py", line 222, in handle_request self.process_request(request, client_address) File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/SocketServer.py", line 429, in process_request self.collect_children() File "/opt/users/buildbot/slave/trunk.loewis-sun/build/Lib/SocketServer.py", line 425, in collect_children self.active_children.remove(pid) ValueError: list.remove(x): x not in list 1 test failed: test_socketserver sincerely, -The Buildbot

1 0