Mailman 3 December 2010 - Python-checkins

r87553 - in python/branches/py3k: Lib/webbrowser.py Misc/NEWS
by terry.reedy Dec. 28, 2010

Dec. 28, 2010

Author: terry.reedy Date: Tue Dec 28 20:30:19 2010 New Revision: 87553 Log: Issue 10738: Fix webbrowser.Opera.raise_opts value. Modified: python/branches/py3k/Lib/webbrowser.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/webbrowser.py ============================================================================== --- python/branches/py3k/Lib/webbrowser.py (original) +++ python/branches/py3k/Lib/webbrowser.py Tue Dec 28 20:30:19 2010 @@ -286,12 +286,10 @@ """Launcher class for Mozilla/Netscape browsers.""" raise_opts = ["-noraise", "-raise"] - remote_args = ['-remote', 'openURL(%s%action)'] remote_action = "" remote_action_newwin = ",new-window" remote_action_newtab = ",new-tab" - background = True Netscape = Mozilla @@ -304,15 +302,13 @@ remote_args = ['%action', '%s'] remote_action = "-n" remote_action_newwin = "-w" - background = True class Opera(UnixBrowser): "Launcher class for Opera browser." - raise_opts = ["", "-raise"] - + raise_opts = ["-noraise", ""] remote_args = ['-remote', 'openURL(%s%action)'] remote_action = "" remote_action_newwin = ",new-window" Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Dec 28 20:30:19 2010 @@ -20,6 +20,8 @@ Library ------- +- Issue 10738: Fix webbrowser.Opera.raise_opts + - Issue 9824: SimpleCookie now encodes , and ; in values to cater to how browsers actually parse cookies.

1 0

r87552 - in python/branches/release27-maint: Lib/Cookie.py Lib/test/test_cookie.py Misc/NEWS
by r.david.murray Dec. 28, 2010

Dec. 28, 2010

Author: r.david.murray Date: Tue Dec 28 20:11:03 2010 New Revision: 87552 Log: Merged revisions 87550 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87550 | r.david.murray | 2010-12-28 13:54:13 -0500 (Tue, 28 Dec 2010) | 8 lines #9824: encode , and ; in cookie values so that browsers don't split on them There is a small chance of backward incompatibility here, but only for non-SimpleCookie applications reading SimpleCookie generated cookies. Even then, any such ap is likely to be handling escaped values already, and it would take a fairly perverse implementation of unescaping to fail to unescape these newly escaped chars, so the risk seems minimal. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Lib/Cookie.py python/branches/release27-maint/Lib/test/test_cookie.py python/branches/release27-maint/Misc/NEWS Modified: python/branches/release27-maint/Lib/Cookie.py ============================================================================== --- python/branches/release27-maint/Lib/Cookie.py (original) +++ python/branches/release27-maint/Lib/Cookie.py Tue Dec 28 20:11:03 2010 @@ -258,6 +258,11 @@ '\033' : '\\033', '\034' : '\\034', '\035' : '\\035', '\036' : '\\036', '\037' : '\\037', + # Because of the way browsers really handle cookies (as opposed + # to what the RFC says) we also encode , and ; + + ',' : '\\054', ';' : '\\073', + '"' : '\\"', '\\' : '\\\\', '\177' : '\\177', '\200' : '\\200', '\201' : '\\201', Modified: python/branches/release27-maint/Lib/test/test_cookie.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_cookie.py (original) +++ python/branches/release27-maint/Lib/test/test_cookie.py Tue Dec 28 20:11:03 2010 @@ -72,6 +72,14 @@ self.assertEqual(C['Customer']['expires'], 'Wed, 01-Jan-98 00:00:00 GMT') + def test_extended_encode(self): + # Issue 9824: some browsers don't follow the standard; we now + # encode , and ; to keep them from tripping up. + C = Cookie.SimpleCookie() + C['val'] = "some,funky;stuff" + self.assertEqual(C.output(['val']), + 'Set-Cookie: val="some\\054funky\\073stuff"') + def test_quoted_meta(self): # Try cookie with quoted meta-data C = Cookie.SimpleCookie() Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Tue Dec 28 20:11:03 2010 @@ -22,6 +22,9 @@ Library ------- +- Issue 9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + - Issue #1379416: eliminated a source of accidental unicode promotion in email.header.Header.encode.

1 0

r87551 - in python/branches/release31-maint: Lib/http/cookies.py Lib/test/test_http_cookies.py Misc/NEWS
by r.david.murray Dec. 28, 2010

Dec. 28, 2010

Author: r.david.murray Date: Tue Dec 28 19:56:33 2010 New Revision: 87551 Log: Merged revisions 87550 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87550 | r.david.murray | 2010-12-28 13:54:13 -0500 (Tue, 28 Dec 2010) | 8 lines #9824: encode , and ; in cookie values so that browsers don't split on them There is a small chance of backward incompatibility here, but only for non-SimpleCookie applications reading SimpleCookie generated cookies. Even then, any such ap is likely to be handling escaped values already, and it would take a fairly perverse implementation of unescaping to fail to unescape these newly escaped chars, so the risk seems minimal. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/http/cookies.py python/branches/release31-maint/Lib/test/test_http_cookies.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/http/cookies.py ============================================================================== --- python/branches/release31-maint/Lib/http/cookies.py (original) +++ python/branches/release31-maint/Lib/http/cookies.py Tue Dec 28 19:56:33 2010 @@ -178,6 +178,11 @@ '\033' : '\\033', '\034' : '\\034', '\035' : '\\035', '\036' : '\\036', '\037' : '\\037', + # Because of the way browsers really handle cookies (as opposed + # to what the RFC says) we also encode , and ; + + ',' : '\\054', ';' : '\\073', + '"' : '\\"', '\\' : '\\\\', '\177' : '\\177', '\200' : '\\200', '\201' : '\\201', Modified: python/branches/release31-maint/Lib/test/test_http_cookies.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_http_cookies.py (original) +++ python/branches/release31-maint/Lib/test/test_http_cookies.py Tue Dec 28 19:56:33 2010 @@ -65,6 +65,14 @@ </script> """) + def test_extended_encode(self): + # Issue 9824: some browsers don't follow the standard; we now + # encode , and ; to keep them from tripping up. + C = cookies.SimpleCookie() + C['val'] = "some,funky;stuff" + self.assertEqual(C.output(['val']), + 'Set-Cookie: val="some\\054funky\\073stuff"') + def test_special_attrs(self): # 'expires' C = cookies.SimpleCookie('Customer="WILE_E_COYOTE"') Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Tue Dec 28 19:56:33 2010 @@ -24,6 +24,9 @@ Library ------- +- Issue 9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + - Issue #5258/#10642: if site.py encounters a .pth file that generates an error, it now prints the filename, line number, and traceback to stderr and skips the rest of that individual file, instead of stopping processing entirely.

1 0

r87550 - in python/branches/py3k: Lib/http/cookies.py Lib/test/test_http_cookies.py Misc/NEWS
by r.david.murray Dec. 28, 2010

Dec. 28, 2010

Author: r.david.murray Date: Tue Dec 28 19:54:13 2010 New Revision: 87550 Log: #9824: encode , and ; in cookie values so that browsers don't split on them There is a small chance of backward incompatibility here, but only for non-SimpleCookie applications reading SimpleCookie generated cookies. Even then, any such ap is likely to be handling escaped values already, and it would take a fairly perverse implementation of unescaping to fail to unescape these newly escaped chars, so the risk seems minimal. Modified: python/branches/py3k/Lib/http/cookies.py python/branches/py3k/Lib/test/test_http_cookies.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/http/cookies.py ============================================================================== --- python/branches/py3k/Lib/http/cookies.py (original) +++ python/branches/py3k/Lib/http/cookies.py Tue Dec 28 19:54:13 2010 @@ -173,6 +173,11 @@ '\033' : '\\033', '\034' : '\\034', '\035' : '\\035', '\036' : '\\036', '\037' : '\\037', + # Because of the way browsers really handle cookies (as opposed + # to what the RFC says) we also encode , and ; + + ',' : '\\054', ';' : '\\073', + '"' : '\\"', '\\' : '\\\\', '\177' : '\\177', '\200' : '\\200', '\201' : '\\201', Modified: python/branches/py3k/Lib/test/test_http_cookies.py ============================================================================== --- python/branches/py3k/Lib/test/test_http_cookies.py (original) +++ python/branches/py3k/Lib/test/test_http_cookies.py Tue Dec 28 19:54:13 2010 @@ -69,6 +69,14 @@ </script> """) + def test_extended_encode(self): + # Issue 9824: some browsers don't follow the standard; we now + # encode , and ; to keep them from tripping up. + C = cookies.SimpleCookie() + C['val'] = "some,funky;stuff" + self.assertEqual(C.output(['val']), + 'Set-Cookie: val="some\\054funky\\073stuff"') + def test_special_attrs(self): # 'expires' C = cookies.SimpleCookie('Customer="WILE_E_COYOTE"') Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Dec 28 19:54:13 2010 @@ -20,6 +20,9 @@ Library ------- +- Issue 9824: SimpleCookie now encodes , and ; in values to cater to how + browsers actually parse cookies. + - Issue 9333: os.symlink now available regardless of user privileges. The function now raises OSError on Windows >=6.0 when the user is unable to create symbolic links. XP and 2003 still raise NotImplementedError.

1 0

r87549 - in python/branches/py3k: Doc/library/sys.rst Include/pydebug.h Misc/NEWS Modules/main.c Python/pythonrun.c Python/sysmodule.c
by georg.brandl Dec. 28, 2010

Dec. 28, 2010

Author: georg.brandl Date: Tue Dec 28 19:30:18 2010 New Revision: 87549 Log: Add sys.flags.quiet attribute for the new -q option, as noted missing by Eric in #1772833. Modified: python/branches/py3k/Doc/library/sys.rst python/branches/py3k/Include/pydebug.h python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/main.c python/branches/py3k/Python/pythonrun.c python/branches/py3k/Python/sysmodule.c Modified: python/branches/py3k/Doc/library/sys.rst ============================================================================== --- python/branches/py3k/Doc/library/sys.rst (original) +++ python/branches/py3k/Doc/library/sys.rst Tue Dec 28 19:30:18 2010 @@ -264,6 +264,11 @@ +------------------------------+------------------------------------------+ | :const:`bytes_warning` | -b | +------------------------------+------------------------------------------+ + | :const:`quiet` | -q | + +------------------------------+------------------------------------------+ + + .. versionchanged:: 3.2 + Added ``quiet`` attribute for the new :option:`-q` flag. .. data:: float_info Modified: python/branches/py3k/Include/pydebug.h ============================================================================== --- python/branches/py3k/Include/pydebug.h (original) +++ python/branches/py3k/Include/pydebug.h Tue Dec 28 19:30:18 2010 @@ -7,6 +7,7 @@ PyAPI_DATA(int) Py_DebugFlag; PyAPI_DATA(int) Py_VerboseFlag; +PyAPI_DATA(int) Py_QuietFlag; PyAPI_DATA(int) Py_InteractiveFlag; PyAPI_DATA(int) Py_InspectFlag; PyAPI_DATA(int) Py_OptimizeFlag; Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Dec 28 19:30:18 2010 @@ -15,6 +15,8 @@ - Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem encoding instead of UTF-8. +- Add sys.flags attribute for the new -q command-line option. + Library ------- Modified: python/branches/py3k/Modules/main.c ============================================================================== --- python/branches/py3k/Modules/main.c (original) +++ python/branches/py3k/Modules/main.c Tue Dec 28 19:30:18 2010 @@ -319,7 +319,6 @@ int stdin_is_interactive = 0; int help = 0; int version = 0; - int quiet = 0; int saw_unbuffered_flag = 0; PyCompilerFlags cf; @@ -427,7 +426,7 @@ break; case 'q': - quiet++; + Py_QuietFlag++; break; /* This space reserved for other options */ @@ -594,7 +593,7 @@ #endif Py_Initialize(); - if (!quiet && (Py_VerboseFlag || + if (!Py_QuietFlag && (Py_VerboseFlag || (command == NULL && filename == NULL && module == NULL && stdin_is_interactive))) { fprintf(stderr, "Python %s on %s\n", Modified: python/branches/py3k/Python/pythonrun.c ============================================================================== --- python/branches/py3k/Python/pythonrun.c (original) +++ python/branches/py3k/Python/pythonrun.c Tue Dec 28 19:30:18 2010 @@ -78,6 +78,7 @@ int Py_DebugFlag; /* Needed by parser.c */ int Py_VerboseFlag; /* Needed by import.c */ +int Py_QuietFlag; /* Needed by sysmodule.c */ int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */ int Py_InspectFlag; /* Needed to determine whether to exit at SystemError */ int Py_NoSiteFlag; /* Suppress 'import site' */ Modified: python/branches/py3k/Python/sysmodule.c ============================================================================== --- python/branches/py3k/Python/sysmodule.c (original) +++ python/branches/py3k/Python/sysmodule.c Tue Dec 28 19:30:18 2010 @@ -1417,7 +1417,8 @@ #endif /* {"unbuffered", "-u"}, */ /* {"skip_first", "-x"}, */ - {"bytes_warning", "-b"}, + {"bytes_warning", "-b"}, + {"quiet", "-q"}, {0} }; @@ -1461,6 +1462,7 @@ /* SetFlag(saw_unbuffered_flag); */ /* SetFlag(skipfirstline); */ SetFlag(Py_BytesWarningFlag); + SetFlag(Py_QuietFlag); #undef SetFlag if (PyErr_Occurred()) {

1 0

r87548 - python/branches/py3k/Lib/test/symlink_support.py
by brian.curtin Dec. 28, 2010

Dec. 28, 2010

Author: brian.curtin Date: Tue Dec 28 18:12:43 2010 New Revision: 87548 Log: This file was obsolted by a number of adjustments to the os.symlink tests on Windows, and is no longer needed by any tests or Lib/test/support.py Removed: python/branches/py3k/Lib/test/symlink_support.py Deleted: python/branches/py3k/Lib/test/symlink_support.py ============================================================================== --- python/branches/py3k/Lib/test/symlink_support.py Tue Dec 28 18:12:43 2010 +++ (empty file) @@ -1,206 +0,0 @@ -""" -A module built to test if the current process has the privilege to -create symlinks on Windows. -""" - -# allow script to run natively under python 2.6+ -from __future__ import print_function - -import ctypes -from ctypes import wintypes - -GetCurrentProcess = ctypes.windll.kernel32.GetCurrentProcess -GetCurrentProcess.restype = wintypes.HANDLE -OpenProcessToken = ctypes.windll.advapi32.OpenProcessToken -OpenProcessToken.argtypes = (wintypes.HANDLE, wintypes.DWORD, - ctypes.POINTER(wintypes.HANDLE)) -OpenProcessToken.restype = wintypes.BOOL - -class LUID(ctypes.Structure): - _fields_ = [ - ('low_part', wintypes.DWORD), - ('high_part', wintypes.LONG), - ] - - def __eq__(self, other): - return ( - self.high_part == other.high_part and - self.low_part == other.low_part - ) - - def __ne__(self, other): - return not (self==other) - -LookupPrivilegeValue = ctypes.windll.advapi32.LookupPrivilegeValueW -LookupPrivilegeValue.argtypes = ( - wintypes.LPWSTR, # system name - wintypes.LPWSTR, # name - ctypes.POINTER(LUID), - ) -LookupPrivilegeValue.restype = wintypes.BOOL - -class TOKEN_INFORMATION_CLASS: - TokenUser = 1 - TokenGroups = 2 - TokenPrivileges = 3 - # ... see http://msdn.microsoft.com/en-us/library/aa379626%28VS.85%29.aspx - -SE_PRIVILEGE_ENABLED_BY_DEFAULT = (0x00000001) -SE_PRIVILEGE_ENABLED = (0x00000002) -SE_PRIVILEGE_REMOVED = (0x00000004) -SE_PRIVILEGE_USED_FOR_ACCESS = (0x80000000) - -class LUID_AND_ATTRIBUTES(ctypes.Structure): - _fields_ = [ - ('LUID', LUID), - ('attributes', wintypes.DWORD), - ] - - def is_enabled(self): - return bool(self.attributes & SE_PRIVILEGE_ENABLED) - - def enable(self): - self.attributes |= SE_PRIVILEGE_ENABLED - - def get_name(self): - size = wintypes.DWORD(10240) - buf = ctypes.create_unicode_buffer(size.value) - res = LookupPrivilegeName(None, self.LUID, buf, size) - if res == 0: - raise RuntimeError - return buf[:size.value] - - def __str__(self): - name = self.name - fmt = ['{name}', '{name} (enabled)'][self.is_enabled()] - return fmt.format(**vars()) - -LookupPrivilegeName = ctypes.windll.advapi32.LookupPrivilegeNameW -LookupPrivilegeName.argtypes = ( - wintypes.LPWSTR, # lpSystemName - ctypes.POINTER(LUID), # lpLuid - wintypes.LPWSTR, # lpName - ctypes.POINTER(wintypes.DWORD), #cchName - ) -LookupPrivilegeName.restype = wintypes.BOOL - -class TOKEN_PRIVILEGES(ctypes.Structure): - _fields_ = [ - ('count', wintypes.DWORD), - ('privileges', LUID_AND_ATTRIBUTES*0), - ] - - def get_array(self): - array_type = LUID_AND_ATTRIBUTES*self.count - privileges = ctypes.cast(self.privileges, - ctypes.POINTER(array_type)).contents - return privileges - - def __iter__(self): - return iter(self.get_array()) - -PTOKEN_PRIVILEGES = ctypes.POINTER(TOKEN_PRIVILEGES) - -GetTokenInformation = ctypes.windll.advapi32.GetTokenInformation -GetTokenInformation.argtypes = [ - wintypes.HANDLE, # TokenHandle - ctypes.c_uint, # TOKEN_INFORMATION_CLASS value - ctypes.c_void_p, # TokenInformation - wintypes.DWORD, # TokenInformationLength - ctypes.POINTER(wintypes.DWORD), # ReturnLength - ] -GetTokenInformation.restype = wintypes.BOOL - -# http://msdn.microsoft.com/en-us/library/aa375202%28VS.85%29.aspx -AdjustTokenPrivileges = ctypes.windll.advapi32.AdjustTokenPrivileges -AdjustTokenPrivileges.restype = wintypes.BOOL -AdjustTokenPrivileges.argtypes = [ - wintypes.HANDLE, # TokenHandle - wintypes.BOOL, # DisableAllPrivileges - PTOKEN_PRIVILEGES, # NewState (optional) - wintypes.DWORD, # BufferLength of PreviousState - PTOKEN_PRIVILEGES, # PreviousState (out, optional) - ctypes.POINTER(wintypes.DWORD), # ReturnLength - ] - -def get_process_token(): - "Get the current process token" - token = wintypes.HANDLE() - TOKEN_ALL_ACCESS = 0xf01ff - res = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, token) - if not res > 0: - raise RuntimeError("Couldn't get process token") - return token - -def get_symlink_luid(): - "Get the LUID for the SeCreateSymbolicLinkPrivilege" - symlink_luid = LUID() - res = LookupPrivilegeValue(None, "SeCreateSymbolicLinkPrivilege", - symlink_luid) - if not res > 0: - raise RuntimeError("Couldn't lookup privilege value") - return symlink_luid - -def get_privilege_information(): - "Get all privileges associated with the current process." - # first call with zero length to determine what size buffer we need - - return_length = wintypes.DWORD() - params = [ - get_process_token(), - TOKEN_INFORMATION_CLASS.TokenPrivileges, - None, - 0, - return_length, - ] - - res = GetTokenInformation(*params) - - # assume we now have the necessary length in return_length - - buffer = ctypes.create_string_buffer(return_length.value) - params[2] = buffer - params[3] = return_length.value - - res = GetTokenInformation(*params) - assert res > 0, "Error in second GetTokenInformation (%d)" % res - - privileges = ctypes.cast(buffer, ctypes.POINTER(TOKEN_PRIVILEGES)).contents - return privileges - -def report_privilege_information(): - "Report all privilege information assigned to the current process." - privileges = get_privilege_information() - print("found {0} privileges".format(privileges.count)) - tuple(map(print, privileges)) - -def enable_symlink_privilege(): - """ - Try to assign the symlink privilege to the current process token. - Return True if the assignment is successful. - """ - # create a space in memory for a TOKEN_PRIVILEGES structure - # with one element - size = ctypes.sizeof(TOKEN_PRIVILEGES) - size += ctypes.sizeof(LUID_AND_ATTRIBUTES) - buffer = ctypes.create_string_buffer(size) - tp = ctypes.cast(buffer, ctypes.POINTER(TOKEN_PRIVILEGES)).contents - tp.count = 1 - tp.get_array()[0].enable() - tp.get_array()[0].LUID = get_symlink_luid() - token = get_process_token() - res = AdjustTokenPrivileges(token, False, tp, 0, None, None) - if res == 0: - raise RuntimeError("Error in AdjustTokenPrivileges") - - ERROR_NOT_ALL_ASSIGNED = 1300 - return ctypes.windll.kernel32.GetLastError() != ERROR_NOT_ALL_ASSIGNED - -def main(): - assigned = enable_symlink_privilege() - msg = ['failure', 'success'][assigned] - - print("Symlink privilege assignment completed with {0}".format(msg)) - -if __name__ == '__main__': - main()

1 0

r87547 - python/branches/py3k/Doc/library/os.rst
by brian.curtin Dec. 28, 2010

Dec. 28, 2010

Author: brian.curtin Date: Tue Dec 28 18:08:22 2010 New Revision: 87547 Log: Minor doc update for #9333. Took out the phrasing about os.symlink not existing and mentioned the OSError possibility. Modified: python/branches/py3k/Doc/library/os.rst Modified: python/branches/py3k/Doc/library/os.rst ============================================================================== --- python/branches/py3k/Doc/library/os.rst (original) +++ python/branches/py3k/Doc/library/os.rst Tue Dec 28 18:08:22 2010 @@ -1395,12 +1395,15 @@ .. note:: - The *SeCreateSymbolicLinkPrivilege* is required in order to create - symlinks, so the function is only available when the privilege is held. - This privilege is not typically granted to regular users but is available - to accounts which can escalate privileges to the administrator level. - Either obtaining the privilege or running your application as an - administrator are ways to successfully create symlinks. + The *SeCreateSymbolicLinkPrivilege* is required in order to successfully + create symlinks. This privilege is not typically granted to regular + users but is available to accounts which can escalate privileges to the + administrator level. Either obtaining the privilege or running your + application as an administrator are ways to successfully create symlinks. + + + :exc:`OSError` is raised when the function is called by an unprivileged + user. Availability: Unix, Windows.

1 0

r87546 - in python/branches/release26-maint: Lib/test/test_normalization.py Lib/test/test_unicodedata.py Modules/unicodedata.c
by alexander.belopolsky Dec. 28, 2010

Dec. 28, 2010

Author: alexander.belopolsky Date: Tue Dec 28 17:15:08 2010 New Revision: 87546 Log: Merged revisions 87541,87543 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r87541 | alexander.belopolsky | 2010-12-28 10:47:56 -0500 (Tue, 28 Dec 2010) | 9 lines Merged revisions 87442 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87442 | alexander.belopolsky | 2010-12-22 21:27:37 -0500 (Wed, 22 Dec 2010) | 1 line Issue #10254: Fixed a crash and a regression introduced by the implementation of PRI 29. ........ ................ r87543 | alexander.belopolsky | 2010-12-28 11:04:06 -0500 (Tue, 28 Dec 2010) | 1 line fixed issue 10254 test ................ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_normalization.py python/branches/release26-maint/Lib/test/test_unicodedata.py python/branches/release26-maint/Modules/unicodedata.c Modified: python/branches/release26-maint/Lib/test/test_normalization.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_normalization.py (original) +++ python/branches/release26-maint/Lib/test/test_normalization.py Tue Dec 28 17:15:08 2010 @@ -49,9 +49,6 @@ if line.startswith("@Part"): part = line.split()[0] continue - if part == "@Part3": - # XXX we don't support PRI #29 yet, so skip these tests for now - continue try: c1,c2,c3,c4,c5 = [unistr(x) for x in line.split(';')[:-1]] except RangeError: Modified: python/branches/release26-maint/Lib/test/test_unicodedata.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_unicodedata.py (original) +++ python/branches/release26-maint/Lib/test/test_unicodedata.py Tue Dec 28 17:15:08 2010 @@ -187,9 +187,22 @@ def test_pr29(self): # http://www.unicode.org/review/pr-29.html - for text in (u"\u0b47\u0300\u0b3e", u"\u1100\u0300\u1161"): + # See issues #1054943 and #10254. + composed = (u"\u0b47\u0300\u0b3e", u"\u1100\u0300\u1161", + u'Li\u030dt-s\u1e73\u0301', + u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c' + + u'\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917', + u'\u0915\u093f\u0930\u094d\u0917\u093f\u091c\u093c' + + 'u\u0938\u094d\u0924\u093e\u0928') + for text in composed: self.assertEqual(self.db.normalize('NFC', text), text) + def test_issue10254(self): + # Crash reported in #10254 + a = u'C\u0338' * 20 + u'C\u0327' + b = u'C\u0338' * 20 + u'\xC7' + self.assertEqual(self.db.normalize('NFC', a), b) + def test_east_asian_width(self): eaw = self.db.east_asian_width self.assertRaises(TypeError, eaw, 'a') Modified: python/branches/release26-maint/Modules/unicodedata.c ============================================================================== --- python/branches/release26-maint/Modules/unicodedata.c (original) +++ python/branches/release26-maint/Modules/unicodedata.c Tue Dec 28 17:15:08 2010 @@ -681,10 +681,14 @@ comb = 0; while (i1 < end) { int comb1 = _getrecord_ex(*i1)->combining; - if (comb && (comb1 == 0 || comb == comb1)) { - /* Character is blocked. */ - i1++; - continue; + if (comb) { + if (comb1 == 0) + break; + if (comb >= comb1) { + /* Character is blocked. */ + i1++; + continue; + } } l = find_nfc_index(self, nfc_last, *i1); /* *i1 cannot be combined with *i. If *i1 @@ -708,6 +712,7 @@ /* Replace the original character. */ *i = code; /* Mark the second character unused. */ + assert(cskipped < 20); skipped[cskipped++] = i1; i1++; f = find_nfc_index(self, nfc_first, *i);

1 0

r87545 - in python/branches/release31-maint: Lib/html/parser.py Lib/test/test_htmlparser.py
by senthil.kumaran Dec. 28, 2010

Dec. 28, 2010

Author: senthil.kumaran Date: Tue Dec 28 17:10:56 2010 New Revision: 87545 Log: Merged revisions 87542 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87542 | senthil.kumaran | 2010-12-28 23:55:16 +0800 (Tue, 28 Dec 2010) | 3 lines Fix Issue10759 - html.parser.unescape() fails on HTML entities with incorrect syntax ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/html/parser.py python/branches/release31-maint/Lib/test/test_htmlparser.py Modified: python/branches/release31-maint/Lib/html/parser.py ============================================================================== --- python/branches/release31-maint/Lib/html/parser.py (original) +++ python/branches/release31-maint/Lib/html/parser.py Tue Dec 28 17:10:56 2010 @@ -367,13 +367,16 @@ return s def replaceEntities(s): s = s.groups()[0] - if s[0] == "#": - s = s[1:] - if s[0] in ['x','X']: - c = int(s[1:], 16) - else: - c = int(s) - return chr(c) + try: + if s[0] == "#": + s = s[1:] + if s[0] in ['x','X']: + c = int(s[1:], 16) + else: + c = int(s) + return chr(c) + except ValueError: + return '&#'+ s +';' else: # Cannot use name2codepoint directly, because HTMLParser # supports apos, which is not part of HTML 4 Modified: python/branches/release31-maint/Lib/test/test_htmlparser.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_htmlparser.py (original) +++ python/branches/release31-maint/Lib/test/test_htmlparser.py Tue Dec 28 17:10:56 2010 @@ -319,6 +319,10 @@ self._run_check("<html foo='€&aa&unsupported;'>", [ ("starttag", "html", [("foo", "\u20AC&aa&unsupported;")]) ]) + def test_unescape_function(self): + p = html.parser.HTMLParser() + self.assertEqual(p.unescape('&#bad;'),'&#bad;') + self.assertEqual(p.unescape('&'),'&') def test_main():

1 0

r87544 - in python/branches/release27-maint/Lib: HTMLParser.py test/test_htmlparser.py
by senthil.kumaran Dec. 28, 2010

Dec. 28, 2010

Author: senthil.kumaran Date: Tue Dec 28 17:05:07 2010 New Revision: 87544 Log: Fix Issue10759 - HTMLParser.unescape() to handle malform charrefs. Modified: python/branches/release27-maint/Lib/HTMLParser.py python/branches/release27-maint/Lib/test/test_htmlparser.py Modified: python/branches/release27-maint/Lib/HTMLParser.py ============================================================================== --- python/branches/release27-maint/Lib/HTMLParser.py (original) +++ python/branches/release27-maint/Lib/HTMLParser.py Tue Dec 28 17:05:07 2010 @@ -367,13 +367,16 @@ return s def replaceEntities(s): s = s.groups()[0] - if s[0] == "#": - s = s[1:] - if s[0] in ['x','X']: - c = int(s[1:], 16) - else: - c = int(s) - return unichr(c) + try: + if s[0] == "#": + s = s[1:] + if s[0] in ['x','X']: + c = int(s[1:], 16) + else: + c = int(s) + return unichr(c) + except ValueError: + return '&#'+s+';' else: # Cannot use name2codepoint directly, because HTMLParser supports apos, # which is not part of HTML 4 Modified: python/branches/release27-maint/Lib/test/test_htmlparser.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_htmlparser.py (original) +++ python/branches/release27-maint/Lib/test/test_htmlparser.py Tue Dec 28 17:05:07 2010 @@ -320,6 +320,11 @@ ("endtag", "p"), ]) + def test_unescape_function(self): + parser = HTMLParser.HTMLParser() + self.assertEqual(parser.unescape('&#bad;'),'&#bad;') + self.assertEqual(parser.unescape('&'),'&') + def test_main(): test_support.run_unittest(HTMLParserTestCase)

1 0