Mailman 3 May 2008 - Python-checkins

r63776 - python/trunk/Lib/lib-tk/Tkinter.py
by georg.brandl May 29, 2008

May 29, 2008

Author: georg.brandl Date: Thu May 29 09:18:49 2008 New Revision: 63776 Log: #2906: accept lists for options, and some cosmetic fixes in Tkinter. Modified: python/trunk/Lib/lib-tk/Tkinter.py Modified: python/trunk/Lib/lib-tk/Tkinter.py ============================================================================== --- python/trunk/Lib/lib-tk/Tkinter.py (original) +++ python/trunk/Lib/lib-tk/Tkinter.py Thu May 29 09:18:49 2008 @@ -1053,6 +1053,12 @@ if k[-1] == '_': k = k[:-1] if callable(v): v = self._register(v) + elif isinstance(v, (tuple, list)): + for item in v: + if not isinstance(item, (basestring, int)): + break + else: + v = ' '.join(map(str, v)) res = res + ('-'+k, v) return res def nametowidget(self, name): @@ -1092,7 +1098,6 @@ if self._tclCommands is None: self._tclCommands = [] self._tclCommands.append(name) - #print '+ Tkinter created command', name return name register = _register def _root(self): @@ -1747,10 +1752,11 @@ after=widget - pack it after you have packed widget anchor=NSEW (or subset) - position widget according to given direction - before=widget - pack it before you will pack widget + before=widget - pack it before you will pack widget expand=bool - expand widget if parent size grows fill=NONE or X or Y or BOTH - fill widget if widget grows in=master - use master to contain this widget + in_=master - see 'in' option description ipadx=amount - add internal padding in x direction ipady=amount - add internal padding in y direction padx=amount - add padding in x direction @@ -1788,29 +1794,26 @@ Base class to use the methods place_* in every widget.""" def place_configure(self, cnf={}, **kw): """Place a widget in the parent widget. Use as options: - in=master - master relative to which the widget is placed. + in=master - master relative to which the widget is placed + in_=master - see 'in' option description x=amount - locate anchor of this widget at position x of master y=amount - locate anchor of this widget at position y of master relx=amount - locate anchor of this widget between 0.0 and 1.0 relative to width of master (1.0 is right edge) - rely=amount - locate anchor of this widget between 0.0 and 1.0 + rely=amount - locate anchor of this widget between 0.0 and 1.0 relative to height of master (1.0 is bottom edge) - anchor=NSEW (or subset) - position anchor according to given direction + anchor=NSEW (or subset) - position anchor according to given direction width=amount - width of this widget in pixel height=amount - height of this widget in pixel relwidth=amount - width of this widget between 0.0 and 1.0 relative to width of master (1.0 is the same width - as the master) - relheight=amount - height of this widget between 0.0 and 1.0 + as the master) + relheight=amount - height of this widget between 0.0 and 1.0 relative to height of master (1.0 is the same - height as the master) - bordermode="inside" or "outside" - whether to take border width of master widget - into account - """ - for k in ['in_']: - if kw.has_key(k): - kw[k[:-1]] = kw[k] - del kw[k] + height as the master) + bordermode="inside" or "outside" - whether to take border width of + master widget into account + """ self.tk.call( ('place', 'configure', self._w) + self._options(cnf, kw)) @@ -1845,6 +1848,7 @@ column=number - use cell identified with given column (starting with 0) columnspan=number - this widget will span several columns in=master - use master to contain this widget + in_=master - see 'in' option description ipadx=amount - add internal padding in x direction ipady=amount - add internal padding in y direction padx=amount - add padding in x direction

1 0

r63775 - python/trunk/Doc/c-api/bytearray.rst
by georg.brandl May 29, 2008

May 29, 2008

Author: georg.brandl Date: Thu May 29 09:18:17 2008 New Revision: 63775 Log: Two fixes in bytearray docs. Modified: python/trunk/Doc/c-api/bytearray.rst Modified: python/trunk/Doc/c-api/bytearray.rst ============================================================================== --- python/trunk/Doc/c-api/bytearray.rst (original) +++ python/trunk/Doc/c-api/bytearray.rst Thu May 29 09:18:17 2008 @@ -7,10 +7,12 @@ .. index:: object: bytearray +.. versionadded:: 2.6 + .. ctype:: PyByteArrayObject - This subtype of :ctype:`PyObject` represents a Python string object. + This subtype of :ctype:`PyObject` represents a Python bytearray object. .. cvar:: PyTypeObject PyByteArray_Type @@ -36,6 +38,8 @@ Return a new bytearray object from any object, *o*, that implements the buffer protocol. + .. XXX expand about the buffer protocol, at least somewhere + .. cfunction:: PyObject* PyByteArray_FromStringAndSize(const char *string, Py_ssize_t len)

1 0

buildbot failure in sparc Debian trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of sparc Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Debian%20trunk/builds/449 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-sparc Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_pickletools make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in g4 osx.4 trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of g4 osx.4 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/g4%20osx.4%20trunk/builds/3453 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: psf-g4 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 2 tests failed: test_urllib2 test_urllib2net ====================================================================== ERROR: test_trivial (test.test_urllib2.TrivialTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 35, in test_trivial f = urllib2.urlopen(file_url) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1212, in file_open return self.open_local_file(req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1231, in open_local_file localfile = url2pathname(file) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 55, in url2pathname return unquote(pathname) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_file (test.test_urllib2.HandlerTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 619, in test_file r = h.file_open(Request(url)) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1212, in file_open return self.open_local_file(req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1231, in open_local_file localfile = url2pathname(file) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 55, in url2pathname return unquote(pathname) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_ftp (test.test_urllib2.HandlerTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 579, in test_ftp r = h.ftp_open(req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1301, in ftp_open return addinfourl(fp, headers, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_http (test.test_urllib2.HandlerTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 722, in test_http r = h.do_open(http, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_redirect (test.test_urllib2.HandlerTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 830, in test_redirect MockHeaders({"location": to_url})) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 565, in http_error_302 new = self.redirect_request(req, fp, code, msg, headers, newurl) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 545, in redirect_request raise HTTPError(req.get_full_url(), code, msg, headers, fp) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 162, in __init__ self.__super_init(fp, hdrs, url, code) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_build_opener (test.test_urllib2.MiscTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2.py", line 1044, in test_build_opener o = build_opener(FooHandler, BarHandler) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 461, in build_opener opener.add_handler(klass()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 673, in __init__ proxies = getproxies() File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 1552, in getproxies return getproxies_environment() or getproxies_macosx_sysconf() TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_file (test.test_urllib2net.OtherNetworkTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 118, in test_file self._test_urls(urls, self._extra_handlers(), urllib2.urlopen) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 156, in _test_urls urllib2.install_opener(urllib2.build_opener(*handlers)) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 461, in build_opener opener.add_handler(klass()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 673, in __init__ proxies = getproxies() File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 1552, in getproxies return getproxies_environment() or getproxies_macosx_sysconf() TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_ftp (test.test_urllib2net.OtherNetworkTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 106, in test_ftp self._test_urls(urls, self._extra_handlers()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 156, in _test_urls urllib2.install_opener(urllib2.build_opener(*handlers)) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 461, in build_opener opener.add_handler(klass()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 673, in __init__ proxies = getproxies() File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 1552, in getproxies return getproxies_environment() or getproxies_macosx_sysconf() TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_close (test.test_urllib2net.CloseSocketTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 76, in test_close response = _urlopen_with_retry("http://www.python.org/") File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1116, in http_open return self.do_open(httplib.HTTPConnection, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_ftp_NoneNodefault (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 228, in test_ftp_NoneNodefault u = _urlopen_with_retry(self.FTP_HOST, timeout=None) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1292, in ftp_open fp, retrlen = fw.retrfile(file, type) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 892, in retrfile self.endtransfer), conn[1]) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_ftp_NoneWithdefault (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 222, in test_ftp_NoneWithdefault u = _urlopen_with_retry(self.FTP_HOST, timeout=None) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1292, in ftp_open fp, retrlen = fw.retrfile(file, type) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 892, in retrfile self.endtransfer), conn[1]) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_ftp_Value (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 232, in test_ftp_Value u = _urlopen_with_retry(self.FTP_HOST, timeout=60) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1292, in ftp_open fp, retrlen = fw.retrfile(file, type) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 892, in retrfile self.endtransfer), conn[1]) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_ftp_basic (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 215, in test_ftp_basic u = _urlopen_with_retry(self.FTP_HOST) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1292, in ftp_open fp, retrlen = fw.retrfile(file, type) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 892, in retrfile self.endtransfer), conn[1]) TypeError: 'NoneType' object is not callable ====================================================================== ERROR: test_http_NoneNodefault (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 209, in test_http_NoneNodefault u = _urlopen_with_retry("http://www.python.org", timeout=None) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1116, in http_open return self.do_open(httplib.HTTPConnection, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_http_NoneWithdefault (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 199, in test_http_NoneWithdefault u = _urlopen_with_retry("http://www.python.org", timeout=None) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1116, in http_open return self.do_open(httplib.HTTPConnection, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_http_Value (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 205, in test_http_Value u = _urlopen_with_retry("http://www.python.org", timeout=120) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1116, in http_open return self.do_open(httplib.HTTPConnection, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found ====================================================================== ERROR: test_http_basic (test.test_urllib2net.TimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 192, in test_http_basic u = _urlopen_with_retry("http://www.python.org") File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/test/test_urllib2net.py", line 19, in _urlopen_with_retry return urllib2.urlopen(host, *args, **kwargs) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data, timeout) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 380, in open response = self._open(req, data) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 398, in _open '_open', req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 358, in _call_chain result = func(*args) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1116, in http_open return self.do_open(httplib.HTTPConnection, req) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib2.py", line 1107, in do_open resp = addinfourl(fp, r.msg, req.get_full_url()) File "/Users/buildslave/bb/trunk.psf-g4/build/Lib/urllib.py", line 967, in __init__ addbase.__init__(self, fp) TypeError: expected string or Unicode object, NoneType found make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in x86 gentoo trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of x86 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20gentoo%20trunk/builds/3717 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-x86 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_pickletools make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r63769 - sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
by brett.cannon May 29, 2008

May 29, 2008

Author: brett.cannon Date: Thu May 29 07:13:13 2008 New Revision: 63769 Log: Fixer for UserString.UserString over to the collections module. Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py Thu May 29 07:13:13 2008 @@ -265,6 +265,7 @@ "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup", "threading_cleanup", "reap_children"]), 'commands': ('subprocess', ['getstatusoutput', 'getoutput']), + 'UserString' : ('collections', ['UserString']), }

1 0

r63767 - in python/trunk: Doc/library/userdict.rst Lib/UserString.py Lib/test/test_py3kwarn.py Lib/test/test_userstring.py Misc/NEWS
by brett.cannon May 29, 2008

May 29, 2008

Author: brett.cannon Date: Thu May 29 07:08:50 2008 New Revision: 63767 Log: UserString.MutableString has been removed in Python 3.0. Works on issue #2877. Thanks Quentin Gallet-Gilles for the patch. Modified: python/trunk/Doc/library/userdict.rst python/trunk/Lib/UserString.py python/trunk/Lib/test/test_py3kwarn.py python/trunk/Lib/test/test_userstring.py python/trunk/Misc/NEWS Modified: python/trunk/Doc/library/userdict.rst ============================================================================== --- python/trunk/Doc/library/userdict.rst (original) +++ python/trunk/Doc/library/userdict.rst Thu May 29 07:08:50 2008 @@ -178,6 +178,9 @@ mutable object as dictionary key, which would be otherwise very error prone and hard to track down. + .. deprecated:: 2.6 + The :class:`MutableString` class has been removed in Python 3.0. + In addition to supporting the methods and operations of string and Unicode objects (see section :ref:`string-methods`), :class:`UserString` instances provide the following attribute: Modified: python/trunk/Lib/UserString.py ============================================================================== --- python/trunk/Lib/UserString.py (original) +++ python/trunk/Lib/UserString.py Thu May 29 07:08:50 2008 @@ -146,6 +146,9 @@ A faster and better solution is to rewrite your program using lists.""" def __init__(self, string=""): + from warnings import warnpy3k + warnpy3k('the class UserString.MutableString has been removed in ' + 'Python 3.0', stacklevel=2) self.data = string def __hash__(self): raise TypeError, "unhashable type (it is mutable)" Modified: python/trunk/Lib/test/test_py3kwarn.py ============================================================================== --- python/trunk/Lib/test/test_py3kwarn.py (original) +++ python/trunk/Lib/test/test_py3kwarn.py Thu May 29 07:08:50 2008 @@ -219,6 +219,14 @@ func = getattr(commands, name) self.assertRaises(DeprecationWarning, func, *([None]*arg_count)) + def test_mutablestring_removal(self): + # UserString.MutableString has been removed in 3.0. + import UserString + with catch_warning(record=False): + warnings.filterwarnings("error", ".*MutableString", + DeprecationWarning) + self.assertRaises(DeprecationWarning, UserString.MutableString) + def test_main(): with catch_warning(record=True): Modified: python/trunk/Lib/test/test_userstring.py ============================================================================== --- python/trunk/Lib/test/test_userstring.py (original) +++ python/trunk/Lib/test/test_userstring.py Thu May 29 07:08:50 2008 @@ -4,8 +4,8 @@ import string from test import test_support, string_tests - from UserString import UserString, MutableString +import warnings class UserStringTest( string_tests.CommonTest, @@ -135,7 +135,10 @@ self.assertEqual(s, "") def test_main(): - test_support.run_unittest(UserStringTest, MutableStringTest) + with test_support.catch_warning(record=False): + warnings.filterwarnings("ignore", ".*MutableString", + DeprecationWarning) + test_support.run_unittest(UserStringTest, MutableStringTest) if __name__ == "__main__": test_main() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 29 07:08:50 2008 @@ -63,6 +63,9 @@ Library ------- +Issue #2877 - The UserString.MutableString class has been removed in + Python 3.0. + - Do not close external file objects passed to tarfile.open(mode='w:bz2') when the TarFile is closed.

1 0

buildbot failure in amd64 XP 3.0
by buildbot＠python.org May 28, 2008

May 28, 2008

The Buildbot has detected a new failure of amd64 XP 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20XP%203.0/builds/963 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows-amd64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 842, in do_POST self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 4, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 488, in _bootstrap_inner self.run() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 444, in run self._target(*self._args, **self._kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 89, in writerThread self._writerThread(*args, **kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 278, in _writerThread self.assertEqual(data, self.makeData(key)) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\unittest.py", line 325, in failUnlessEqual raise self.failureException(msg or '%r != %r' % (first, second)) AssertionError: None != b'1004-1004-1004-1004-1004' Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 488, in _bootstrap_inner self.run() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 444, in run self._target(*self._args, **self._kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 89, in writerThread self._writerThread(*args, **kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 278, in _writerThread self.assertEqual(data, self.makeData(key)) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\unittest.py", line 325, in failUnlessEqual raise self.failureException(msg or '%r != %r' % (first, second)) AssertionError: None != b'0007-0007-0007-0007-0007' Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 488, in _bootstrap_inner self.run() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\threading.py", line 444, in run self._target(*self._args, **self._kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 89, in writerThread self._writerThread(*args, **kwargs) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\bsddb\test\test_thread.py", line 278, in _writerThread self.assertEqual(data, self.makeData(key)) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\unittest.py", line 325, in failUnlessEqual raise self.failureException(msg or '%r != %r' % (first, second)) AssertionError: None != b'2001-2001-2001-2001-2001' 4 tests failed: test_httpservers test_pydoc test_site test_winsound ====================================================================== ERROR: test_post (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_httpservers.py", line 325, in test_post res = self.request('/cgi-bin/file2.py', 'POST', params, headers) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_httpservers.py", line 63, in request return self.connection.getresponse() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\client.py", line 975, in getresponse response.begin() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\client.py", line 395, in begin version, status, reason = self._read_status() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\client.py", line 351, in _read_status line = str(self.fp.readline(), "iso-8859-1") File "C:\buildbot\3.0.heller-windows-amd64\build\lib\io.py", line 510, in readline b = self.read(nreadahead()) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\io.py", line 577, in read n = self.readinto(b) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 217, in readinto return self._sock.recv_into(b) socket.error: [Errno 10053] An established connection was aborted by the software in your host machine ====================================================================== FAIL: test_authorization (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_httpservers.py", line 339, in test_authorization (res.read(), res.getheader('Content-type'), res.status)) AssertionError: (b'Hello World\n', 'text/html', 200) != (b'', None, 200) ====================================================================== FAIL: test_headers_and_content (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_httpservers.py", line 320, in test_headers_and_content (res.read(), res.getheader('Content-type'), res.status)) AssertionError: (b'Hello World\n', 'text/html', 200) != (b'', None, 200) ====================================================================== FAIL: test_html_doc (test.test_pydoc.PyDocDocTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_pydoc.py", line 237, in test_html_doc self.fail("outputs are not equal, see diff above") AssertionError: outputs are not equal, see diff above ====================================================================== FAIL: test_s_option (test.test_site.HelperFunctionsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_site.py", line 105, in test_s_option self.assertEqual(rc, 1) AssertionError: 0 != 1 ====================================================================== ERROR: test_alias_asterisk (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_winsound.py", line 87, in test_alias_asterisk winsound.PlaySound('SystemAsterisk', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_exclamation (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_winsound.py", line 97, in test_alias_exclamation winsound.PlaySound('SystemExclamation', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_exit (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_winsound.py", line 107, in test_alias_exit winsound.PlaySound('SystemExit', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_hand (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_winsound.py", line 117, in test_alias_hand winsound.PlaySound('SystemHand', winsound.SND_ALIAS) RuntimeError: Failed to play sound ====================================================================== ERROR: test_alias_question (test.test_winsound.PlaySoundTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\test\test_winsound.py", line 127, in test_alias_question winsound.PlaySound('SystemQuestion', winsound.SND_ALIAS) RuntimeError: Failed to play sound Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socketserver.py", line 614, in __init__ self.handle() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 358, in handle_one_request method() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 842, in do_POST self.run_cgi() File "C:\buildbot\3.0.heller-windows-amd64\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 4, in <module> File "C:\buildbot\3.0.heller-windows-amd64\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str sincerely, -The Buildbot

1 0

r63766 - in python/branches/okkoto-sizeof: Lib/test/test_sys.py Objects/longobject.c Objects/stringobject.c
by robert.schuppenies May 28, 2008

May 28, 2008

Author: robert.schuppenies Date: Wed May 28 19:07:50 2008 New Revision: 63766 Log: cleanup Modified: python/branches/okkoto-sizeof/Lib/test/test_sys.py python/branches/okkoto-sizeof/Objects/longobject.c python/branches/okkoto-sizeof/Objects/stringobject.c Modified: python/branches/okkoto-sizeof/Lib/test/test_sys.py ============================================================================== --- python/branches/okkoto-sizeof/Lib/test/test_sys.py (original) +++ python/branches/okkoto-sizeof/Lib/test/test_sys.py Wed May 28 19:07:50 2008 @@ -1,6 +1,6 @@ # -*- coding: iso-8859-1 -*- import unittest, test.test_support -import sys, cStringIO, inspect +import sys, cStringIO, os class SysModuleTest(unittest.TestCase): @@ -396,19 +396,16 @@ self.headersize = self.l + self.p if hasattr(sys, "gettotalrefcount"): self.headersize += 2 * self.p - self.f = open(test.test_support.TESTFN, 'wb') + self.file = open(test.test_support.TESTFN, 'wb') def tearDown(self): - import os - if self.f: - self.f.close() + self.file.close() os.remove(test.test_support.TESTFN) def check_sizeof(self, o, size, ): - size += self.headersize result = sys.getsizeof(o) - msg = 'wrong size for ' + str(type(o)) + ': got '+\ - str(result) + ', expected ' + str(size) + msg = 'wrong size for %s: got %d, expected %d' \ + % (type(o), result, size) self.assertEqual(result, size, msg) def align(self, value): @@ -428,49 +425,49 @@ self.assertTrue( (self.align(9) % self.p) == 0 ) def test_standardobjects(self): - import inspect i = self.i l = self.l p = self.p + h = self.headersize # bool - self.check_sizeof(True, self.l) + self.check_sizeof(True, h + l) # buffer - self.check_sizeof(buffer(''), 2*p + 2*l + self.align(i) +l) + self.check_sizeof(buffer(''), h + 2*p + 2*l + self.align(i) +l) # bytearray - self.check_sizeof(bytes(), self.align(i) + l + p) + self.check_sizeof(bytes(), h + self.align(i) + l + p) # cell def get_cell(): x = 42 def inner(): return x return inner - self.check_sizeof(get_cell().func_closure[0], p) + self.check_sizeof(get_cell().func_closure[0], h + p) # old-style class class class_oldstyle(): def method(): pass - self.check_sizeof(class_oldstyle, 6*p) + self.check_sizeof(class_oldstyle, h + 6*p) # instance - self.check_sizeof(class_oldstyle(), 3*p) + self.check_sizeof(class_oldstyle(), h + 3*p) # method - self.check_sizeof(class_oldstyle().method, 4*p) + self.check_sizeof(class_oldstyle().method, h + 4*p) # code - self.check_sizeof(get_cell().func_code, self.align(4*i) + 8*p +\ + self.check_sizeof(get_cell().func_code, h + self.align(4*i) + 8*p +\ self.align(i) + 2*p) # complex - self.check_sizeof(complex(0,1), 2*8) + self.check_sizeof(complex(0,1), h + 2*8) # enumerate - self.check_sizeof(enumerate([]), l + 3*p) + self.check_sizeof(enumerate([]), h + l + 3*p) # reverse - self.check_sizeof(reversed(''), l + p ) + self.check_sizeof(reversed(''), h + l + p ) # file - self.check_sizeof(self.f, 4*p + self.align(2*i) + 4*p +\ + self.check_sizeof(self.file, h + 4*p + self.align(2*i) + 4*p +\ self.align(3*i) + 2*p + self.align(i)) # float - self.check_sizeof(float(0), 8) + self.check_sizeof(float(0), h + 8) # function def func(): pass - self.check_sizeof(func, 9 * l) + self.check_sizeof(func, h + 9 * l) class c(): @staticmethod def foo(): @@ -479,28 +476,28 @@ def bar(cls): pass # staticmethod - self.check_sizeof(foo, l) + self.check_sizeof(foo, h + l) # classmethod - self.check_sizeof(bar, l) + self.check_sizeof(bar, h + l) # generator def get_gen(): yield 1 - self.check_sizeof(get_gen(), p + self.align(i) + 2*p) + self.check_sizeof(get_gen(), h + p + self.align(i) + 2*p) # integer - self.check_sizeof(1, l) + self.check_sizeof(1, h + l) # builtin_function_or_method - self.check_sizeof(abs, 3*p) + self.check_sizeof(abs, h + 3*p) # module - self.check_sizeof(unittest, p) + self.check_sizeof(unittest, h + p) # xange - self.check_sizeof(xrange(1), 3*p) + self.check_sizeof(xrange(1), h + 3*p) # slice - self.check_sizeof(slice(0), 3*p) + self.check_sizeof(slice(0), h + 3*p) def test_variable_size(self): i = self.i l = self.l p = self.p - self.headersize += l + h = self.headersize + l # new-style class class class_newstyle(object): def method(): @@ -508,31 +505,32 @@ # type (PyTypeObject + PyNumberMethods + PyMappingMethods + # PySequenceMethods + PyBufferProcs) len_typeobject = p + 2*l + 15*p + l + 4*p + l + 9*p + l + 11*p - self.check_sizeof(class_newstyle, \ + self.check_sizeof(class_newstyle, h + \ len_typeobject + 42*p + 10*p + 3*p + 6*p) # string - self.check_sizeof('', l + self.align(i + 1)) - self.check_sizeof('abc', l + self.align(i + 1) + 3) + self.check_sizeof('', h + l + self.align(i + 1)) + self.check_sizeof('abc', h + l + self.align(i + 1) + 3) # long - self.check_sizeof(0L, + self.align(2)) - self.check_sizeof(1L, + self.align(2)) - self.check_sizeof(-1L, + self.align(2)) - self.check_sizeof(32768L, + self.align(2) + 2) - self.check_sizeof(32768L*32768L-1, + self.align(2) + 2) - self.check_sizeof(32768L*32768L, + self.align(2) + 4) + self.check_sizeof(0L, h + self.align(2)) + self.check_sizeof(1L, h + self.align(2)) + self.check_sizeof(-1L, h + self.align(2)) + self.check_sizeof(32768L, h + self.align(2) + 2) + self.check_sizeof(32768L*32768L-1, h + self.align(2) + 2) + self.check_sizeof(32768L*32768L, h + self.align(2) + 4) def test_special_types(self): i = self.i l = self.l p = self.p + h = self.headersize # dict - self.check_sizeof({}, 3*l + 3*p + 8*(l + 2*p)) + self.check_sizeof({}, h + 3*l + 3*p + 8*(l + 2*p)) longdict = {1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8} - self.check_sizeof(longdict, 3*l + 3*p + 8*(l + 2*p) + 16*(l + 2*p)) + self.check_sizeof(longdict, h + 3*l + 3*p + 8*(l + 2*p) + 16*(l + 2*p)) # list - self.check_sizeof([], l + p + l) - self.check_sizeof([1, 2, 3], l + p + l + 3*l) + self.check_sizeof([], h + l + p + l) + self.check_sizeof([1, 2, 3], h + l + p + l + 3*l) def test_main(): Modified: python/branches/okkoto-sizeof/Objects/longobject.c ============================================================================== --- python/branches/okkoto-sizeof/Objects/longobject.c (original) +++ python/branches/okkoto-sizeof/Objects/longobject.c Wed May 28 19:07:50 2008 @@ -3445,6 +3445,7 @@ long_sizeof(PyLongObject *v) { Py_ssize_t res; + res = sizeof(PyLongObject) + abs(v->ob_size) * sizeof(digit); if (v->ob_size != 0) res -= sizeof(digit); Modified: python/branches/okkoto-sizeof/Objects/stringobject.c ============================================================================== --- python/branches/okkoto-sizeof/Objects/stringobject.c (original) +++ python/branches/okkoto-sizeof/Objects/stringobject.c Wed May 28 19:07:50 2008 @@ -4008,9 +4008,9 @@ {"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS, expandtabs__doc__}, {"splitlines", (PyCFunction)string_splitlines, METH_VARARGS, - sizeof__doc__}, - {"__sizeof__", (PyCFunction)string_sizeof, METH_NOARGS, splitlines__doc__}, + {"__sizeof__", (PyCFunction)string_sizeof, METH_NOARGS, + sizeof__doc__}, {"__getnewargs__", (PyCFunction)string_getnewargs, METH_NOARGS}, {NULL, NULL} /* sentinel */ };

1 0

r63765 - python/branches/okkoto-sizeof/Objects/typeobject.c
by robert.schuppenies May 28, 2008

May 28, 2008

Author: robert.schuppenies Date: Wed May 28 18:44:00 2008 New Revision: 63765 Log: cleanup Modified: python/branches/okkoto-sizeof/Objects/typeobject.c Modified: python/branches/okkoto-sizeof/Objects/typeobject.c ============================================================================== --- python/branches/okkoto-sizeof/Objects/typeobject.c (original) +++ python/branches/okkoto-sizeof/Objects/typeobject.c Wed May 28 18:44:00 2008 @@ -2611,7 +2611,6 @@ static PyObject * type_sizeof(PyObject *self, PyObject *args) { - printf("type_sizeof\n"); return PyInt_FromSsize_t(self->ob_type->tp_basicsize); } @@ -2621,7 +2620,7 @@ {"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS, PyDoc_STR("__subclasses__() -> list of immediate subclasses")}, {"__sizeof__", type_sizeof, METH_NOARGS | METH_CLASS, - PyDoc_STR("default sizeof implementation for type")}, + PyDoc_STR("__sizeof__() -> size of type in bytes")}, {0} }; @@ -3431,7 +3430,7 @@ {"__format__", object_format, METH_VARARGS, PyDoc_STR("default object formatter")}, {"__sizeof__", object_sizeof, METH_NOARGS, - PyDoc_STR("default sizeof implementation")}, + PyDoc_STR("__sizeof__() -> size of object in bytes")}, {0} };

1 0