← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib2_wrappers.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-13 01:32:26 UTC
  • mfrom: (5606 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5607.
  • Revision ID: jelmer@samba.org-20110113013226-1d41bwtmps9y68wm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
598
598
                        'Bad status line received',
599
599
                        orig_error=exc_val)
600
600
                elif (isinstance(exc_val, socket.error) and len(exc_val.args)
601
 
                      and exc_val.args[0] in (errno.ECONNRESET, 10054)):
 
601
                      and exc_val.args[0] in (errno.ECONNRESET, 10053, 10054)):
 
602
                      # 10053 == WSAECONNABORTED
 
603
                      # 10054 == WSAECONNRESET
602
604
                    raise errors.ConnectionReset(
603
605
                        "Connection lost while sending request.")
604
606
                else: