[Bug 839426] Re: bzr crashed with UnicodeDecodeError in write_revision_to_string(): 'ascii' codec can't decode byte 0xe2 in position 4759: ordinal not in range(128)

2011-09-02 Thread Martin [gz]
The problem appears to be with the commit message you provided. What mechanism did you use to add it? Was a template supplied by or plugin, or did you type it into your default editor, and what exactly was it? Did any of the files you were adding have non-ascii names? If you try adding a new set o

[Bug 819185] Re: bzr crashed with error in pack_stat(): integer out of range for 'L' format code

2011-09-02 Thread Martin [gz]
*** This bug is a duplicate of bug 683191 *** https://bugs.launchpad.net/bugs/683191 Involves either a very large file or a far distant timestamp, this variant comes from the pure python dirstate code rather than the pyrex extensions. ** This bug has been marked a duplicate of bug 683191 "

[Bug 839210] Re: Bazaar crashes when adding a files larger than 4GB

2011-09-02 Thread Martin [gz]
*** This bug is a duplicate of bug 683191 *** https://bugs.launchpad.net/bugs/683191 The recent fix for bug 54624 should help here by preventing people accidentally committing huge files, but the bug is in the dirstate code (both python and pyrex versions) trying to fit the filesize in a 32 bi

[Bug 839515] Re: bzr crashed with BzrCheckError in _commit_write_group(): Internal check failed: Cannot add revision(s) to repository: missing referenced chk root keys: [StaticTuple('sha1:3c52a9038699

2011-09-02 Thread Martin [gz]
*** This bug is a duplicate of bug 522637 *** https://bugs.launchpad.net/bugs/522637 There are instructions in the existing bug for repairing an affected repository. It's a little worrying that something messed up the repo after the root cause was fixed. -- You received this bug notification

[Bug 839515] Re: bzr crashed with BzrCheckError in _commit_write_group(): Internal check failed: Cannot add revision(s) to repository: missing referenced chk root keys: [StaticTuple('sha1:3c52a9038699

2011-09-02 Thread Martin [gz]
*** This bug is a duplicate of bug 522637 *** https://bugs.launchpad.net/bugs/522637 ** This bug has been marked a duplicate of bug 522637 BzrCheckError: Cannot add revision(s) to repository: missing referenced chk root keys -- You received this bug notification because you are a member

[Bug 836107] Re: bzr crashes with exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 1: ordinal not in range(128) on etckeeper call

2011-08-28 Thread Martin [gz]
*** This bug is a duplicate of bug 791839 *** https://bugs.launchpad.net/bugs/791839 Here the problem is etckeeper doesn't set a locale when running bzr. See also bug 77657 and bug 715547 for the issue causing the traceback rather than a cleaner error. ** This bug has been marked a duplicate

[Bug 820517] Re: bzr crashed with ValueError in _last_revision_info(): need more than 1 value to unpack

2011-08-05 Thread Martin [gz]
*** This bug is a duplicate of bug 623152 *** https://bugs.launchpad.net/bugs/623152 See the existing bug entry for more information, the likely cause is disk corruption, recreating the repo should resolve it. ** This bug has been marked a duplicate of bug 623152 ValueError: need more than

[Bug 820752] Re: bzr crashed with IndexError in dir_grep(): list index out of range

2011-08-05 Thread Martin [gz]
** Package changed: bzr (Ubuntu) => bzr-grep (Ubuntu) -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/820752 Title: bzr crashed with IndexError in dir_grep(): list index out of range To manage notifi

[Bug 815845] Re: bzr crashed with ErrorFromSmartServer in _translate_error(): Error received from smart server: ('error', "bytes must be a string, got ")

2011-07-26 Thread Martin [gz]
*** This bug is a duplicate of bug 721163 *** https://bugs.launchpad.net/bugs/721163 You're right that bug 656178 is about the same issue, but that bug entry has been closed since the improved error message was added, and further work is happening in the newer bug. -- You received this bug n

[Bug 815845] Re: bzr crashed with ErrorFromSmartServer in _translate_error(): Error received from smart server: ('error', "bytes must be a string, got ")

2011-07-25 Thread Martin [gz]
*** This bug is a duplicate of bug 721163 *** https://bugs.launchpad.net/bugs/721163 This is likely to be the same issue as the existing reports, but the circumstances it happens under are still mysterious. If you could check the server .bzr.log for the traceback there, and add any further ins

[Bug 812842] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command(): 'ascii' codec can't decode byte 0xc3 in position 29: ordinal not in range(128)

2011-07-23 Thread Martin [gz]
*** This bug is a duplicate of bug 686735 *** https://bugs.launchpad.net/bugs/686735 To resolve this issue, upgrade the qbzr plugin to 0.20.1 or later version. ** This bug has been marked a duplicate of bug 686735 qbzr crashed with UnicodeDecodeError in run_subprocess_command() -- You re

[Bug 809048] Re: bzr crashed with AttributeError in stopTest(): '_TypeEqualityDict' object has no attribute 'clear'

2011-07-12 Thread Martin [gz]
** Bug watch added: Python Roundup #12544 http://bugs.python.org/issue12544 ** Also affects: python via http://bugs.python.org/issue12544 Importance: Unknown Status: Unknown -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubun

[Bug 809048] Re: bzr crashed with AttributeError in stopTest(): '_TypeEqualityDict' object has no attribute 'clear'

2011-07-12 Thread Martin [gz]
Actually, it's not quite that easy as there's now a straight _TypeEqualityDict<->TestCase reference link. I'll see if I can get upstream to accept some kind of fix. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad

[Bug 809048] Re: bzr crashed with AttributeError in stopTest(): '_TypeEqualityDict' object has no attribute 'clear'

2011-07-12 Thread Martin [gz]
Upstream change is: At least with that unittest stops storing bound methods in the dict, so the best upstream change would be to also rename the variable from `_type_equality_funcs` to `_type_equality_func_names` or similar. Perhaps Michael Foord co

[Bug 790268] Re: bzr crashed with UnicodeDecodeError in smart_add(): 'ascii' codec can't decode byte 0xc4 in position 34: ordinal not in range(128)

2011-06-14 Thread Martin [gz]
*** This bug is a duplicate of bug 715547 *** https://bugs.launchpad.net/bugs/715547 See the existing bug for some suggestion on how to resolve this issue. ** This bug has been marked a duplicate of bug 715547 "bzr add" crashed: UnicodeDecodeError in smart_add with ascii codec -- You rec

[Bug 791839] Re: etckeeper runs bzr without a locale set from cron script

2011-06-14 Thread Martin [gz]
Fabien you're right there's another bug here, but etckeeper could use a valid locale when running bzr. ** Summary changed: - bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte ..ordinal not in range + etckeeper runs bzr without a locale set from cron script ** Package c

[Bug 796855] Re: UnicodeDecodeError in smart_add(), current filesystem encoding ANSI_X3.4-1968

2011-06-14 Thread Martin [gz]
*** This bug is a duplicate of bug 791839 *** https://bugs.launchpad.net/bugs/791839 See the existing report against etckeeper, or bug 715547 for the traceback from bzr. ** This bug is no longer a duplicate of bug 790268 bzr crashed with UnicodeDecodeError in smart_add(): 'ascii' codec can

[Bug 777507] Re: bzr crashed with KeyError in sub_process_action()

2011-06-10 Thread Martin [gz]
*** This bug is a duplicate of bug 680787 *** https://bugs.launchpad.net/bugs/680787 ** This bug has been marked a duplicate of bug 680787 qlog: Crashes when trying to revert a file to revision 1 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subsc

[Bug 776764] Re: bzr crashed during 'commit'

2011-06-07 Thread Martin [gz]
*** This bug is a duplicate of bug 709349 *** https://bugs.launchpad.net/bugs/709349 Thanks for the bug report, see the existing entry for progress on the fix. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad

[Bug 776764] Re: bzr crashed during 'commit'

2011-06-07 Thread Martin [gz]
*** This bug is a duplicate of bug 709349 *** https://bugs.launchpad.net/bugs/709349 ** This bug has been marked a duplicate of bug 709349 bzr: ERROR: bzrlib.errors.RetryWithNewPacks: Unprintable exception RetryWithNewPacks -- You received this bug notification because you are a member o

[Bug 788219] Re: bzr crashed with IOError in get_password()

2011-06-07 Thread Martin [gz]
** This bug is no longer a duplicate of bug 534326 bzr: ERROR: gnomekeyring.IOError: -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/788219 Title: bzr crashed with IOError in get_password() -- ub

[Bug 791839] Re: bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte ..ordinal not in range

2011-06-04 Thread Martin [gz]
*** This bug is a duplicate of bug 715547 *** https://bugs.launchpad.net/bugs/715547 As I said in bug 393038 comment 7 this issue is filed as bug 715547. What's interesting in your case here is that you have `fsenc: 'ANSI_X3.4-1968'` (ie, Bazaar is being told that all your filenames are ascii

[Bug 791839] Re: bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte ..ordinal not in range

2011-06-04 Thread Martin [gz]
*** This bug is a duplicate of bug 715547 *** https://bugs.launchpad.net/bugs/715547 ** This bug has been marked a duplicate of bug 715547 "bzr add" crashed ERROR: exceptions.UnicodeDecodeError -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscri

[Bug 788219] Re: bzr crashed with IOError in get_password()

2011-05-26 Thread Martin [gz]
Similar unhelpful exception from gnomekeyring as in bug 554102 but this comes through the launchpad plugin not bzr-gtk so different issue. It's not clear from that report what change was applied, but perhaps the same approach could be used to fix this. -- You received this bug notification becaus

[Bug 686161] Re: conflicts involving unicode paths can't be displayed

2011-05-21 Thread Martin [gz]
** Changed in: bzr Status: In Progress => Fix Released ** Changed in: bzr Milestone: None => 2.4b3 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/686161 Title: conflicts involving unicode

[Bug 693880] Re: bzr under python2.7 fails: _ReportingFileSocket.readline lacks size argument

2011-05-15 Thread Martin [gz]
Is there anything left to do on 2.2 here? It's currently flagged as "Incomplete" which is confusing. Really, anyone who wants to use Python 2.7 with Bazaar should be on at least 2.3 as this was just one of a number of incompatibilities that were fixed on trunk but not backported. -- You received

[Bug 732881] Re: bzr xmlls crashed with TypeError: _escape_cdata() takes exactly 2 arguments (1 given)

2011-05-06 Thread Martin [gz]
*** This bug is a duplicate of bug 696083 *** https://bugs.launchpad.net/bugs/696083 Does the original bug needs an Ubuntu component to track when the release becomes available? ** This bug has been marked a duplicate of bug 696083 _escape_cdata() takes exactly 2 arguments (1 given) * Yo

[Bug 734763] Re: bzr crashed with TypeError in __str__(): _escape_cdata() takes exactly 2 arguments (1 given)

2011-05-06 Thread Martin [gz]
*** This bug is a duplicate of bug 696083 *** https://bugs.launchpad.net/bugs/696083 ** This bug is no longer a duplicate of bug 732881 bzr xmlls crashed with TypeError: _escape_cdata() takes exactly 2 arguments (1 given) ** This bug has been marked a duplicate of bug 696083 _escape_cd

[Bug 769992] Re: bzr: ERROR: exceptions.KeyError: 'No such TDB entry'

2011-04-24 Thread Martin [gz]
*** This bug is a duplicate of bug 664085 *** https://bugs.launchpad.net/bugs/664085 This one also looks like an existing bug, Jelmer may know more. ** This bug has been marked a duplicate of bug 664085 bzr crashed with KeyError in get_revision_paths() on running update from subversion re

[Bug 686161] Re: bzr crashed with UnicodeEncodeError in run()

2011-04-21 Thread Martin [gz]
I have a branch for this. The basic fix is pretty simple, the complicating factors are making sure the ui stuff doesn't then mangle it anyway and needing to rewrite bb.test_conflicts to cover all the different cases. -- You received this bug notification because you are a member of Ubuntu Bugs, w

[Bug 745712] Re: bzr crashed with BzrError in get_unicode_argv(): Parameter ''Use Unicode \xcbdegree characters for Celsius/Farenheit'' is unsupported by the current encoding.

2011-04-20 Thread Martin [gz]
** Changed in: bzr Status: In Progress => Fix Released ** Changed in: bzr Milestone: None => 2.4b2 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/745712 Title: bzr crashed with BzrError i

[Bug 694108] Re: bzr crashed with IndexError in insertIxsWithChangesHighlighted()

2011-04-18 Thread Martin [gz]
*** This bug is a duplicate of bug 447939 *** https://bugs.launchpad.net/bugs/447939 ** This bug has been marked a duplicate of bug 447939 qdiff: crashes with "pop from empty list" * You can subscribe to bug 447939 by following this link: https://bugs.launchpad.net/qbzr/+bug/447939/+subsc

[Bug 710677] Re: bzr crashed with IndexError in insertIxsWithChangesHighlighted()

2011-04-18 Thread Martin [gz]
*** This bug is a duplicate of bug 447939 *** https://bugs.launchpad.net/bugs/447939 ** This bug is no longer a duplicate of bug 694108 bzr crashed with IndexError in insertIxsWithChangesHighlighted() ** This bug has been marked a duplicate of bug 447939 qdiff: crashes with "pop from emp

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-15 Thread Martin [gz]
Sorry Alexander, your patch actually avoids that problem, I misread. There's another corner case with repr I think may be worth handling though. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/686735 Ti

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-15 Thread Martin [gz]
That's the right idea Alexander, but the ability to pass multiple parameters to the unicode() function is there to catch you out - it only works on buffer-type objects, and exception instance attributes can be anything. >>> unicode(object()) u'' >>> unicode(object(), "ascii") Trace

[Bug 745712] Re: bzr crashed with BzrError in get_unicode_argv(): Parameter ''Use Unicode \xcbdegree characters for Celsius/Farenheit'' is unsupported by the current encoding.

2011-04-14 Thread Martin [gz]
The code tries to treat this is as a user error, but gets called from outside the exception catching and reporting mechanism. ** Changed in: bzr Status: Confirmed => In Progress ** Changed in: bzr Assignee: (unassigned) => Martin [gz] (gz) -- You received this bug notifi

[Bug 688677] Re: bzr crashed with UnicodeDecodeError in decode()

2011-04-13 Thread Martin [gz]
This looks like a worse version of bug 502060 caused by having non UTF-8 bytes in a config file. In these circumstances Bazaar should be fixed to give a clear error including the filename. The solution if you're running into this problem would be to delete or manually correct the problem file. **

[Bug 696056] Re: bzr crashed with TypeError in readheaders(): readline() takes exactly 1 argument (2 given)

2011-04-13 Thread Martin [gz]
*** This bug is a duplicate of bug 693880 *** https://bugs.launchpad.net/bugs/693880 This specific error is resolved in Bazaar 2.2.3 but you'll want at least 2.3 for other Python 2.7 related fixes. ** This bug has been marked a duplicate of bug 693880 _ReportingFileSocket.readline lacks si

[Bug 745712] Re: bzr crashed with BzrError in get_unicode_argv(): Parameter ''Use Unicode \xcbdegree characters for Celsius/Farenheit'' is unsupported by the current encoding.

2011-04-13 Thread Martin [gz]
Unix specific problem, in that having LANG=C set means even if your console supports non-ascii characters Bazaar is not being given the information needed to interpret them. The fix is you're having this problem is to set your environment to include your encoding, like LANG=ro_RO.UTF-8 or similar.

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-13 Thread Martin [gz]
This is a problem from the changes in r1234 (really), which blindly calls unicode() on all non-private attributes of an exception instance. If an exception has a non-ascii bytestring in its arguments, this exception will occur. Other objects that can't be stringified are also a potential issue. Th

[Bug 686161] Re: bzr crashed with UnicodeEncodeError in run()

2011-04-13 Thread Martin [gz]
) + this_tree.rename_one('mydir', u'mydir3\xa0') this_tree.commit(message='change') this_tree.merge_from_branch(other_tree.branch) return this_tree, other_tree ** Changed in: bzr Importance: Undecided => Low ** Changed in: bzr Status: New =&

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-13 Thread Martin [gz]
Ignore comment #2 which is intended for bug 686161 not this one. ** Changed in: bzr Importance: Low => Undecided ** Changed in: bzr Status: In Progress => Invalid ** Changed in: bzr Assignee: Martin [gz] (gz) => (unassigned) -- You received this bug notification becaus

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-13 Thread Martin [gz]
A user on IRC has just run into this as well with QBzr 0.21.0.dev, also during a checkout. Extract from his log is at: ** Also affects: qbzr Importance: Undecided Status: New ** Changed in: qbzr Status: New => Confirmed -- You received this bug n

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-13 Thread Martin [gz]
name_one('mydir', u'mydir3\xa0') this_tree.commit(message='change') this_tree.merge_from_branch(other_tree.branch) return this_tree, other_tree ** Changed in: bzr Importance: Undecided => Low ** Changed in: bzr Status: New => In Progress ** Changed in: bzr Assi

[Bug 686735] Re: bzr crashed with UnicodeDecodeError in run_subprocess_command()

2011-04-13 Thread Martin [gz]
** Also affects: bzr Importance: Undecided Status: New -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/686735 Title: bzr crashed with UnicodeDecodeError in run_subprocess_command() -- ubun

[Bug 720853] Re: bzr crashed with RuntimeError in normpath(): maximum recursion depth exceeded while calling a Python object

2011-02-21 Thread Martin [gz]
The 'index' command used here is from the bzr-search plugin. However, the cause of the exception is the recursive method bzrlib.btree_index.BTreeBuilder._add_key so this may still be a core bzrlib problem really. A possible approach to fxing this bug would be rewriting that function to be iterative

[Bug 720853] Re: bzr crashed with RuntimeError in normpath(): maximum recursion depth exceeded while calling a Python object

2011-02-21 Thread Martin [gz]
** Also affects: bzr-search Importance: Undecided Status: New -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/720853 Title: bzr crashed with RuntimeError in normpath(): maximum recursion dep

[Bug 693880] Re: _ReportingFileSocket.readline lacks size argument

2010-12-30 Thread Martin [gz]
The problem is that selftest doesn't pass with Python 2.7, no? Fixes have recently landed for bug 614595 and bug 637674, which leaves three failures, one from bug 654731 and two from bug 654733. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to

[Bug 694604] Re: bzr crashed with TypeError in readheaders()

2010-12-28 Thread Martin [gz]
*** This bug is a duplicate of bug 693880 *** https://bugs.launchpad.net/bugs/693880 ** This bug has been marked a duplicate of bug 693880 _ReportingFileSocket.readline lacks size argument * You can subscribe to bug 693880 by following this link: https://bugs.launchpad.net/bzr/+bug/693880

[Bug 694550] Re: bzr fails to branch in natty

2010-12-26 Thread Martin [gz]
*** This bug is a duplicate of bug 693880 *** https://bugs.launchpad.net/bugs/693880 ** This bug has been marked a duplicate of bug 693880 _ReportingFileSocket.readline lacks size argument * You can subscribe to bug 693880 by following this link: https://bugs.launchpad.net/bzr/+bug/693880

[Bug 694574] Re: Bazaar fails to co a branch

2010-12-26 Thread Martin [gz]
*** This bug is a duplicate of bug 693880 *** https://bugs.launchpad.net/bugs/693880 ** This bug is no longer a duplicate of bug 694550 bzr fails to branch in natty ** This bug has been marked a duplicate of bug 693880 _ReportingFileSocket.readline lacks size argument * You can subscrib

[Bug 675233] Re: Impossible to use bzr

2010-11-14 Thread Martin [gz]
This is a problem with your ssh configuration. Note the "Permission denied (publickey)." which means you don't have the key you've got registered on launchpad on that user account. Compare the contents of ~/.ssh/id_rsa.pub with and check that the corre

[Bug 640760] Re: bzr tags should sort in natural sorting order

2010-10-05 Thread Martin [gz]
** Changed in: bzr Status: Confirmed => Fix Released ** Changed in: bzr Milestone: None => 2.3b2 ** Changed in: bzr Assignee: (unassigned) => Neil Martinsen-Burrell (nmb) ** Changed in: bzr Status: Fix Released => In Progress -- bzr tags should sort in natural sorting or

[Bug 644015] Re: bzr package build should run the test suite

2010-09-22 Thread Martin [gz]
We've got bug 632387 for the LANG=C stuff, and poolie has filed bug 644855 for the test isolation failure. -- bzr package build should run the test suite https://bugs.launchpad.net/bugs/644015 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubunt

[Bug 637700] Re: bzr crashed with ImportError in ()

2010-09-14 Thread Martin [gz]
Traceback (most recent call last): ... File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/builder/cmds.py", line 44, in from bzrlib.plugins.builder.recipe import ( ImportError: cannot import name SAFE_INSTRUCTIONS ** Package changed: bzr (Ubuntu) => bzr-builder (Ubuntu) -- bzr crash

[Bug 637608] Re: bzr crashed with ErrorFromSmartServer in _translate_error()

2010-09-14 Thread Martin [gz]
*** This bug is a duplicate of bug 599968 *** https://bugs.launchpad.net/bugs/599968 ErrorFromSmartServer: Error received from smart server: ('error', "Absent factory for ('debian-20070321172126-hx4btlytc64jyo4n-1', 'a...@jwsdot.com-20070321172152-965dc2b7567eed2f')") lp:~mozillateam/firefox/

[Bug 633915] Re: bzr crashed with ErrorFromSmartServer in _translate_error()

2010-09-13 Thread Martin [gz]
*** This bug is a duplicate of bug 636930 *** https://bugs.launchpad.net/bugs/636930 ** This bug has been marked a duplicate of bug 636930 Upgrading a repository fails with 'Inter1and2Helper' object has no attribute 'source_repo' * You can subscribe to bug 636930 by following this link:

[Bug 615240] Re: sock.makefile().flush has UnboundLocalError bug

2010-08-09 Thread Martin [gz]
** Bug watch added: Python Roundup #9543 http://bugs.python.org/issue9543 ** Also affects: python via http://bugs.python.org/issue9543 Importance: Unknown Status: Unknown -- sock.makefile().flush has UnboundLocalError bug https://bugs.launchpad.net/bugs/615240 You received this b

[Bug 615240] Re: sock.makefile().flush has UnboundLocalError bug

2010-08-09 Thread Martin [gz]
This is from a bad merge: http://svn.python.org/view?view=rev&revision=83624 The original diff: http://svn.python.org/view/python/trunk/Lib/socket.py?r1=75412&r2=75411&pathrev=75412 The merged diff: http://svn.python.org/view/python/branches/release26-maint/Lib/socket.py?r1=81488&r2=83624 Kept t