Rev 2956: Fixed as per Ian's review. in file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/https/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/https/

------------------------------------------------------------
revno: 2956
revision-id: v.ladeuil+lp at free.fr-20090108152817-bz3qc952o4zs1kgk
parent: v.ladeuil+lp at free.fr-20081212143313-xttculpjnshz8rvl
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: https
timestamp: Thu 2009-01-08 16:28:17 +0100
message:
  Fixed as per Ian's review.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-12-12 13:09:26 +0000
+++ b/NEWS	2009-01-08 15:28:17 +0000
@@ -79,6 +79,10 @@
 
   TESTING:
 
+    * An HTTPS server is now available (it requires python-2.6). Future bzr
+      versions will allow the use of the python-2.6 ssl module that can be
+      installed for 2.5 and 2.4.
+
   INTERNALS:
 
     * ``KnitVersionedFiles.get_record_stream()`` will now chose a

=== modified file 'bzrlib/tests/https_server.py'
--- a/bzrlib/tests/https_server.py	2008-01-05 22:19:04 +0000
+++ b/bzrlib/tests/https_server.py	2009-01-08 15:28:17 +0000
@@ -42,6 +42,7 @@
                                   certfile=self.cert_file)
         return sslconn, addr
 
+
 class TestingHTTPSServer(TestingHTTPSServerMixin,
                          http_server.TestingHTTPServer):
 

=== modified file 'bzrlib/tests/ssl_certs/__init__.py'
--- a/bzrlib/tests/ssl_certs/__init__.py	2008-11-05 08:53:10 +0000
+++ b/bzrlib/tests/ssl_certs/__init__.py	2009-01-08 15:28:17 +0000
@@ -23,6 +23,7 @@
 # Directory containing all ssl files, keys or certificates
 base_dir = osutils.dirname(osutils.realpath(__file__))
 
+
 def build_path(name):
     """Build and return a path in ssl_certs directory for name"""
     return osutils.pathjoin(base_dir, name)