Author: troycurtisjr
Date: Mon Nov 20 03:17:22 2017
New Revision: 1815770
URL: http://svn.apache.org/viewvc?rev=1815770&view=rev
Log:
On branch swig-py3: Ensure Python file objects are closed before destruction.
* subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py,
subversion/bindings/swig/python/tests/utils.py,
subversion/bindings/swig/python/tests/wc.py
(SubversionRepositoryTestSetup.setUp,
SubversionWorkingCopyTestCase.test_get_pristine_copy_path,
Temper.alloc_known_repo):
Wrap bare open() calls in a 'with' block to ensure the file object is closed
before destruction.
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/utils.py
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/wc.py
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py?rev=1815770&r1=1815769&r2=1815770&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
(original)
+++
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
Mon Nov 20 03:17:22 2017
@@ -87,17 +87,16 @@ REPOS_URL = core.svn_uri_canonicalize(RE
class SubversionRepositoryTestSetup(TestSetup):
def setUp(self):
- dumpfile = open(os.path.join(os.path.split(__file__)[0],
- 'svnrepos.dump'), 'rb')
+ dump_path = os.path.join(os.path.split(__file__)[0], 'svnrepos.dump')
+ with open(dump_path, 'rb') as dumpfile:
+ # Remove the trac-svnrepos directory, so that we can
+ # ensure a fresh start.
+ self.tearDown()
- # Remove the trac-svnrepos directory, so that we can
- # ensure a fresh start.
- self.tearDown()
-
- r = repos.svn_repos_create(REPOS_PATH, '', '', None, None)
- repos.svn_repos_load_fs2(r, dumpfile, StringIO(),
- repos.svn_repos_load_uuid_ignore, '',
- 0, 0, None)
+ r = repos.svn_repos_create(REPOS_PATH, '', '', None, None)
+ repos.svn_repos_load_fs2(r, dumpfile, StringIO(),
+ repos.svn_repos_load_uuid_ignore, '',
+ 0, 0, None)
def tearDown(self):
if os.path.exists(REPOS_PATH):
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/utils.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/swig/python/tests/utils.py?rev=1815770&r1=1815769&r2=1815770&view=diff
==============================================================================
--- subversion/branches/swig-py3/subversion/bindings/swig/python/tests/utils.py
(original)
+++ subversion/branches/swig-py3/subversion/bindings/swig/python/tests/utils.py
Mon Nov 20 03:17:22 2017
@@ -68,8 +68,9 @@ class Temper(object):
location. Returns the same as alloc_empty_repo."""
dump_path = os.path.join(os.path.dirname(sys.argv[0]), repo_id)
(handle, repo_path, repo_uri) = self.alloc_empty_repo(suffix=suffix)
- repos.svn_repos_load_fs2(handle, open(dump_path, 'rb'), StringIO(),
- repos.load_uuid_default, None, False, False, None)
+ with open(dump_path, 'rb') as dump_fp:
+ repos.svn_repos_load_fs2(handle, dump_fp, StringIO(),
+ repos.load_uuid_default, None, False, False,
None)
return (handle, repo_path, repo_uri)
def file_uri_for_path(path):
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/wc.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/swig/python/tests/wc.py?rev=1815770&r1=1815769&r2=1815770&view=diff
==============================================================================
--- subversion/branches/swig-py3/subversion/bindings/swig/python/tests/wc.py
(original)
+++ subversion/branches/swig-py3/subversion/bindings/swig/python/tests/wc.py
Mon Nov 20 03:17:22 2017
@@ -209,7 +209,8 @@ class SubversionWorkingCopyTestCase(unit
def test_get_pristine_copy_path(self):
path_to_file = '%s/trunk/README.txt' % self.path
path_to_text_base = wc.get_pristine_copy_path(path_to_file)
- text_base = open(path_to_text_base).read()
+ with open(path_to_text_base) as fp:
+ text_base = fp.read()
# TODO: This test should modify the working file first, to ensure the
# path isn't just the path to the working file.
self.assertEqual(text_base, 'A test.\n')
