Mailman 3 January 2010 - Python-checkins

r77758 - tracker/instances/python-dev/extensions/openid_login.py
by martin.v.loewis Jan. 26, 2010

Jan. 26, 2010

Author: martin.v.loewis Date: Tue Jan 26 21:44:55 2010 New Revision: 77758 Log: Consider that lookup returns a single string, not a list. Modified: tracker/instances/python-dev/extensions/openid_login.py Modified: tracker/instances/python-dev/extensions/openid_login.py ============================================================================== --- tracker/instances/python-dev/extensions/openid_login.py (original) +++ tracker/instances/python-dev/extensions/openid_login.py Tue Jan 26 21:44:55 2010 @@ -178,7 +178,7 @@ session = self.db.openid_session.lookup(handle) except KeyError: raise ValueError, 'Not authenticated (no session)' - session = self.db.openid_session.getnode(session[0]) + session = self.db.openid_session.getnode(session) claimed = self.authenticate(session, query) if self.user != 'anonymous': # Existing user claims OpenID @@ -266,7 +266,7 @@ try: handle = self.form['openid.assoc_handle'].value session = self.db.openid_session.lookup(handle) - session = self.db.openid_session.getnode(session[0]) + session = self.db.openid_session.getnode(session) except Exception, e: raise ValueError, "Not authenticated (no session): "+str(e) # re-authenticate fields

1 0

r77757 - python/branches/release26-maint
by tarek.ziade Jan. 26, 2010

Jan. 26, 2010

Author: tarek.ziade Date: Tue Jan 26 18:21:48 2010 New Revision: 77757 Log: Blocked revisions 77756 via svnmerge ........ r77756 | tarek.ziade | 2010-01-26 18:20:37 +0100 (Tue, 26 Jan 2010) | 1 line fixed bdist_msi imports and added a test module for distutils.command.bdist_msi ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77756 - in python/trunk/Lib/distutils: command/bdist_msi.py tests/test_bdist_msi.py
by tarek.ziade Jan. 26, 2010

Jan. 26, 2010

Author: tarek.ziade Date: Tue Jan 26 18:20:37 2010 New Revision: 77756 Log: fixed bdist_msi imports and added a test module for distutils.command.bdist_msi Added: python/trunk/Lib/distutils/tests/test_bdist_msi.py Modified: python/trunk/Lib/distutils/command/bdist_msi.py Modified: python/trunk/Lib/distutils/command/bdist_msi.py ============================================================================== --- python/trunk/Lib/distutils/command/bdist_msi.py (original) +++ python/trunk/Lib/distutils/command/bdist_msi.py Tue Jan 26 18:20:37 2010 @@ -6,15 +6,15 @@ """ Implements the bdist_msi command. """ - import sys, os +from sysconfig import get_python_version, get_platform + from distutils.core import Command from distutils.dir_util import remove_tree -from distutils.sysconfig import get_python_version from distutils.version import StrictVersion from distutils.errors import DistutilsOptionError -from distutils.util import get_platform from distutils import log + import msilib from msilib import schema, sequence, text from msilib import Directory, Feature, Dialog, add_data Added: python/trunk/Lib/distutils/tests/test_bdist_msi.py ============================================================================== --- (empty file) +++ python/trunk/Lib/distutils/tests/test_bdist_msi.py Tue Jan 26 18:20:37 2010 @@ -0,0 +1,23 @@ +"""Tests for distutils.command.bdist_msi.""" +import unittest +import sys + +from distutils.tests import support + +(a)unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") +class BDistMSITestCase(support.TempdirManager, + support.LoggingSilencer, + unittest.TestCase): + + def test_minial(self): + # minimal test XXX need more tests + from distutils.command.bdist_msi import bdist_msi + pkg_pth, dist = self.create_dist() + cmd = bdist_msi(dist) + cmd.ensure_finalized() + +def test_suite(): + return unittest.makeSuite(BDistMSITestCase) + +if __name__ == '__main__': + test_support.run_unittest(test_suite())

1 0

r77755 - in python/trunk/Lib/json: decoder.py encoder.py tests/test_dump.py
by ezio.melotti Jan. 26, 2010

Jan. 26, 2010

Author: ezio.melotti Date: Tue Jan 26 16:57:21 2010 New Revision: 77755 Log: #7092: fix DeprecationWarnings for json when the tests are run with -3 -Wd. Modified: python/trunk/Lib/json/decoder.py python/trunk/Lib/json/encoder.py python/trunk/Lib/json/tests/test_dump.py Modified: python/trunk/Lib/json/decoder.py ============================================================================== --- python/trunk/Lib/json/decoder.py (original) +++ python/trunk/Lib/json/decoder.py Tue Jan 26 16:57:21 2010 @@ -146,8 +146,9 @@ WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS) WHITESPACE_STR = ' \t\n\r' -def JSONObject((s, end), encoding, strict, scan_once, object_hook, +def JSONObject(s_and_end, encoding, strict, scan_once, object_hook, object_pairs_hook, _w=WHITESPACE.match, _ws=WHITESPACE_STR): + s, end = s_and_end pairs = [] pairs_append = pairs.append # Use a slice to prevent IndexError from being raised, the following @@ -227,7 +228,8 @@ pairs = object_hook(pairs) return pairs, end -def JSONArray((s, end), scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR): +def JSONArray(s_and_end, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR): + s, end = s_and_end values = [] nextchar = s[end:end + 1] if nextchar in _ws: Modified: python/trunk/Lib/json/encoder.py ============================================================================== --- python/trunk/Lib/json/encoder.py (original) +++ python/trunk/Lib/json/encoder.py Tue Jan 26 16:57:21 2010 @@ -266,8 +266,6 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot, ## HACK: hand-optimized bytecode; turn globals into locals - False=False, - True=True, ValueError=ValueError, basestring=basestring, dict=dict, @@ -354,8 +352,7 @@ item_separator = _item_separator first = True if _sort_keys: - items = dct.items() - items.sort(key=lambda kv: kv[0]) + items = sorted(dct.items(), key=lambda kv: kv[0]) else: items = dct.iteritems() for key, value in items: Modified: python/trunk/Lib/json/tests/test_dump.py ============================================================================== --- python/trunk/Lib/json/tests/test_dump.py (original) +++ python/trunk/Lib/json/tests/test_dump.py Tue Jan 26 16:57:21 2010 @@ -17,5 +17,5 @@ {True: False, False: True}, sort_keys=True), '{"false": true, "true": false}') self.assertEquals(json.dumps( - {2: 3.0, 4.0: 5L, False: 1, 6L: True, "7": 0}, sort_keys=True), - '{"false": 1, "2": 3.0, "4.0": 5, "6": true, "7": 0}') + {2: 3.0, 4.0: 5L, False: 1, 6L: True}, sort_keys=True), + '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')

1 0

Daily py3k reference leaks (r77750): sum=0
by solipsis＠pitrou.net Jan. 25, 2010

Jan. 25, 2010

py3k results for svn r77750 (hg cset ece6f4fb5793) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogH41oVS', '-x', 'test_httpservers']

1 0

r77754 - tracker/instances/python-dev/extensions/openid_login.py
by martin.v.loewis Jan. 25, 2010

Jan. 25, 2010

Author: martin.v.loewis Date: Tue Jan 26 00:42:39 2010 New Revision: 77754 Log: Streamline authentication: recall claimed ID from session, discover provider-returned ID for consistency. Modified: tracker/instances/python-dev/extensions/openid_login.py Modified: tracker/instances/python-dev/extensions/openid_login.py ============================================================================== --- tracker/instances/python-dev/extensions/openid_login.py (original) +++ tracker/instances/python-dev/extensions/openid_login.py Tue Jan 26 00:42:39 2010 @@ -50,7 +50,34 @@ session.mac_key = session_data['mac_key'] session.expires = now + date.Interval(int(session_data['expires_in'])) self.db.commit() - return session + return session + + def authenticate(self, session, query): + '''Authenticate an OpenID indirect response, and return the claimed ID''' + try: + signed = openid.authenticate(session, query) + except Exception, e: + raise ValueError, "Authentication failed: "+str(e) + if openid.is_op_endpoint(session.stypes): + # Provider-guided login: provider ought to report claimed ID + if 'openid.claimed_id' in query: + claimed = query['openid.claimed_id'][0] + else: + raise ValueError, 'incomplete response' + # OpenID 11.2: verify that provider is authorized to assert ID + discovered = openid.discover(claimed) + if not discovered or discovered[1] != session.url: + raise ValueError, "Provider %s is not authorized to make assertions about %s" % (session.url, claimed) + else: + # User entered claimed ID, stored in session object + claimed = session.provider_id + if not openid.is_compat_1x(session.stypes): + # can only check correct claimed ID for OpenID 2.0 + if 'openid.claimed_id' not in query or claimed != query['openid.claimed_id'][0]: + # assertion is not about an ID, or about a different ID; refuse to accept + raise ValueError, "Provider did not assert your ID" + return claimed + class OpenidLogin(LoginAction, Openid): 'Extended versoin of LoginAction, supporting OpenID identifiers in username field.' @@ -107,7 +134,7 @@ session.assoc_handle, return_to, realm=realm) raise Redirect, url -class OpenidReturn(Action): +class OpenidReturn(Action, Openid): def handle(self): # parse again to get cgi kind of result query = cgi.parse_qs(self.client.env['QUERY_STRING']) @@ -152,20 +179,7 @@ except KeyError: raise ValueError, 'Not authenticated (no session)' session = self.db.openid_session.getnode(session[0]) - try: - signed = openid.authenticate(session, query) - except Exception, e: - import traceback - raise ValueError, "Authentication failed: "+traceback.format_exc() - if 'openid.claimed_id' in query: - if 'claimed_id' not in signed: - raise ValueError, 'Incomplete signature' - claimed = query['openid.claimed_id'][0] - else: - # OpenID 1, claimed ID not reported - should set cookie - if 'identity' not in signed: - raise ValueError, 'Incomplete signature' - claimed = query['openid.identity'][0] + claimed = self.authenticate(session, query) if self.user != 'anonymous': # Existing user claims OpenID @@ -244,7 +258,7 @@ self.db.user.set(self.userid, openids=' '.join(openids)) self.db.commit() -class OpenidRegister(RegisterAction): +class OpenidRegister(RegisterAction, Openid): def handle(self): query = {} if 'openid.identity' not in self.form: @@ -263,20 +277,7 @@ query[key].append(value) except KeyError: query[key] = [value] - try: - signed = openid.authenticate(session, query) - except Exception, e: - raise ValueError, "Authentication failed: "+repr(e) - if 'openid.claimed_id' in query: - if 'claimed_id' not in signed: - raise ValueError, 'Incomplete signature' - claimed = query['openid.claimed_id'][0] - else: - # OpenID 1, claimed ID not reported - should set cookie - if 'identity' not in signed: - raise ValueError, 'Incomplete signature' - claimed = query['openid.identity'][0] - + claimed = self.authenticate(session, query) # OpenID signature is still authentic, now pass it on to the base # register method; also fake password self.form.value.append(cgi.MiniFieldStorage('openids', claimed))

1 0

r77753 - python/branches/release26-maint
by tarek.ziade Jan. 25, 2010

Jan. 25, 2010

Author: tarek.ziade Date: Tue Jan 26 00:21:06 2010 New Revision: 77753 Log: Blocked revisions 77752 via svnmerge ........ r77752 | tarek.ziade | 2010-01-26 00:19:56 +0100 (Tue, 26 Jan 2010) | 1 line switched the call order so this call works without suffering from issue #7774 ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77752 - python/trunk/Lib/sysconfig.py
by tarek.ziade Jan. 25, 2010

Jan. 25, 2010

Author: tarek.ziade Date: Tue Jan 26 00:19:56 2010 New Revision: 77752 Log: switched the call order so this call works without suffering from issue #7774 Modified: python/trunk/Lib/sysconfig.py Modified: python/trunk/Lib/sysconfig.py ============================================================================== --- python/trunk/Lib/sysconfig.py (original) +++ python/trunk/Lib/sysconfig.py Tue Jan 26 00:19:56 2010 @@ -84,7 +84,7 @@ _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) _CONFIG_VARS = None _USER_BASE = None -_PROJECT_BASE = os.path.dirname(abspath(sys.executable)) +_PROJECT_BASE = abspath(os.path.dirname(sys.executable)) if os.name == "nt" and "pcbuild" in _PROJECT_BASE[-8:].lower(): _PROJECT_BASE = abspath(os.path.join(_PROJECT_BASE, pardir))

1 0

r77751 - python/branches/release26-maint/Doc/library/itertools.rst
by raymond.hettinger Jan. 25, 2010

Jan. 25, 2010

Author: raymond.hettinger Date: Mon Jan 25 20:20:30 2010 New Revision: 77751 Log: Fix markup. Modified: python/branches/release26-maint/Doc/library/itertools.rst Modified: python/branches/release26-maint/Doc/library/itertools.rst ============================================================================== --- python/branches/release26-maint/Doc/library/itertools.rst (original) +++ python/branches/release26-maint/Doc/library/itertools.rst Mon Jan 25 20:20:30 2010 @@ -760,7 +760,7 @@ Note, many of the above recipes can be optimized by replacing global lookups with local variables defined as default values. For example, the -*dotproduct* recipe can be written as: +*dotproduct* recipe can be written as:: def dotproduct(vec1, vec2, sum=sum, imap=imap, mul=operator.mul): return sum(imap(mul, vec1, vec2))

1 0

r77750 - in python/branches/py3k: Misc/NEWS
by ezio.melotti Jan. 25, 2010

Jan. 25, 2010

Author: ezio.melotti Date: Mon Jan 25 13:39:47 2010 New Revision: 77750 Log: Merged revisions 77749 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77749 | ezio.melotti | 2010-01-25 14:37:02 +0200 (Mon, 25 Jan 2010) | 1 line Add a news entry for the functions verify and vereq that have been removed in r77729 and r77731 ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Jan 25 13:39:47 2010 @@ -229,6 +229,8 @@ Library ------- +- Removed the functions 'verify' and 'vereq' from Lib/test/support.py. + - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when the release file is empty.

1 0