← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/util/effbot/org/http_manager.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_manager.py
6
6
# Copyright (c) 2001-2004 by Fredrik Lundh.  All rights reserved.
7
7
#
8
8
 
 
9
from __future__ import absolute_import
 
10
 
9
11
import asyncore, time
10
12
import http_client
11
13