Rev 2307: Fix #85305 by issuing an exception instead of a traceback. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2307
revision-id: pqm at pqm.ubuntu.com-20070301033137-9b87fdf211dc2e15
parent: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:31:37 +0000
message:
  Fix #85305 by issuing an exception instead of a traceback.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
    parent: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
    parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2007-02-28 22:08:30 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
    parent: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2007-02-28 16:40:44 -0500
    message:
      Remove trailing whitespace
    ------------------------------------------------------------
    merged: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
    parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: bzr.85305
    timestamp: Sat 2007-02-17 21:31:03 +0100
    message:
      Fix #85305 by issuing an exception instead of a traceback.
      
      * bzrlib/transport/http/_pycurl.py:
      (PyCurlTransport.__init__): Check https support.
      
      * bzrlib/tests/test_http.py:
      (TestWithTransport_pycurl): Moved higher for reuse.
      (TestHttpTransportUrls): Separated from TestHttpUrls to be applied
      to both implementations (pycurl and urllib).
      (TestHttpUrls_urllib, TestHttpUrls_pycurl):