Rev 4038: Catching-up with review tweaks in http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration

------------------------------------------------------------
revno: 4038
revision-id: v.ladeuil+lp at free.fr-20090224081142-bp0u9ryp6kyl2ur3
parent: pqm at pqm.ubuntu.com-20090224073648-8cdhj9m2zsab8hx8
parent: v.ladeuil+lp at free.fr-20090210091925-hog86ju0m3doty42
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Tue 2009-02-24 09:11:42 +0100
message:
  Catching-up with review tweaks
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
    ------------------------------------------------------------
    revno: 3988.2.4
    revision-id: v.ladeuil+lp at free.fr-20090210091925-hog86ju0m3doty42
    parent: v.ladeuil+lp at free.fr-20090210091139-se2d9d3nb8twp0yy
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: httplib-broken-readline
    timestamp: Tue 2009-02-10 10:19:25 +0100
    message:
      Fixed as per Martin's review.
      
      * bzrlib/tests/test_read_bundle.py:
      (TestDeprecations.create_test_bundle,
      TestReadBundleFromURL.create_test_bundle): Add try/finally around
      f.write.
    modified:
      bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
    ------------------------------------------------------------
    revno: 3988.2.3
    revision-id: v.ladeuil+lp at free.fr-20090210091139-se2d9d3nb8twp0yy
    parent: v.ladeuil+lp at free.fr-20090210085255-r75icw1wo30l4ua4
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: httplib-broken-readline
    timestamp: Tue 2009-02-10 10:11:39 +0100
    message:
      Update NEWS about read_bundle_from_url being deprecated.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3988.2.2
    revision-id: v.ladeuil+lp at free.fr-20090210085255-r75icw1wo30l4ua4
    parent: v.ladeuil+lp at free.fr-20090209182543-nb0220ksr5xa20pg
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: httplib-broken-readline
    timestamp: Tue 2009-02-10 09:52:55 +0100
    message:
      Fix failing test.
      
      * bzrlib/tests/test_http.py:
      (TestHTTPRedirections.test_read_redirected_bundle_from_url): Don't
      use read_bundle_from_url since it's deprecated,sigh.
    modified:
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-02-24 07:36:48 +0000
+++ b/NEWS	2009-02-24 08:11:42 +0000
@@ -172,6 +172,8 @@
       respectively, given they are not ready for release in 1.12.
       (Ian Clatworthy)
 
+    * ``read_bundle_from_url`` has been deprecated. (Vincent Ladeuil)
+
   NEW FEATURES:
 
     * Add support for filtering ``bzr missing`` on revisions.  Remote revisions

=== modified file 'bzrlib/tests/test_read_bundle.py'
--- a/bzrlib/tests/test_read_bundle.py	2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_read_bundle.py	2009-02-24 08:11:42 +0000
@@ -72,8 +72,10 @@
     def create_test_bundle(self):
         out, wt = create_bundle_file(self)
         f = open('test_bundle', 'wb')
-        f.write(out.getvalue())
-        f.close()
+        try:
+            f.write(out.getvalue())
+        finally:
+            f.close()
         return wt
 
     def test_read_bundle_from_url_deprecated(self):
@@ -96,8 +98,10 @@
         out, wt = create_bundle_file(self)
         if self.get_transport().is_readonly():
             f = open('test_bundle', 'wb')
-            f.write(out.getvalue())
-            f.close()
+            try:
+                f.write(out.getvalue())
+            finally:
+                f.close()
         else:
             self.get_transport().put_file('test_bundle', out)
             self.log('Put to: %s', self.get_url('test_bundle'))