/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

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