← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/util/effbot/org/http_client.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/effbot/org/http_client.py
11
11
# Copyright (c) 2001-2004 by Fredrik Lundh.  All rights reserved.
12
12
#
13
13
 
 
14
from __future__ import absolute_import
 
15
 
14
16
import asyncore
15
17
import socket, string, time, sys
16
18
import StringIO