← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
16
16
 
17
17
"""http/https transport using pycurl"""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
# TODO: test reporting of http errors
22
20
#
23
21
# TODO: Transport option to control caching of particular requests; broadly we
427
425
 
428
426
def get_test_permutations():
429
427
    """Return the permutations to be used in testing."""
430
 
    from bzrlib.tests import features
 
428
    from bzrlib import tests
431
429
    from bzrlib.tests import http_server
432
430
    permutations = [(PyCurlTransport, http_server.HttpServer_PyCurl),]
433
 
    if features.HTTPSServerFeature.available():
 
431
    if tests.HTTPSServerFeature.available():
434
432
        from bzrlib.tests import (
435
433
            https_server,
436
434
            ssl_certs,