Merge lp:~luoyonggang/subvertpy/closefile into lp:~jelmer/subvertpy/trunk

[Yonggang Luo]

[Jelmer Vernooij (jelmer)]

Merged, tweaked. Thanks for the patch.

review: Approve

[lp:~luoyonggang/subvertpy/closefile]

2429. By Yonggang Luo on 2012-02-29

There is one more file need to be closed.

=== modified file 'subvertpy/tests/__init__.py'
--- subvertpy/tests/__init__.py	2011-11-08 14:41:55 +0000
+++ subvertpy/tests/__init__.py	2012-02-29 10:14:24 +0000
@@ -209,6 +209,11 @@
     def log_message_func(self, items):
         return self.next_message
 
+    def write_file(self, filename, content):
+        f = open(filename, 'w')
+        f.write(content)
+        f.close()
+
     def make_repository(self, relpath, allow_revprop_changes=True):
         """Create a repository.
 
@@ -222,11 +227,11 @@
             if sys.platform == 'win32':
                 revprop_hook = os.path.join(abspath, "hooks",
                         "pre-revprop-change.bat")
-                open(revprop_hook, 'w').write("exit 0\n")
+                self.write_file(revprop_hook, "exit 0\n")
             else:
                 revprop_hook = os.path.join(abspath, "hooks",
                         "pre-revprop-change")
-                open(revprop_hook, 'w').write("#!/bin/sh\n")
+                self.write_file(revprop_hook, "#!/bin/sh\n")
                 os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0111)
 
         if sys.platform == 'win32':
@@ -368,7 +373,7 @@
                     os.makedirs(os.path.dirname(f))
                 except OSError:
                     pass
-                open(f, 'w').write(files[f])
+                self.write_file(f, files[f])
 
     def make_client(self, repospath, clientpath, allow_revprop_changes=True):
         """Create a repository and a checkout. Return the checkout.