From a83e10d04ad728f8145abc03e13dcd6c6495ae95 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 22 Sep 2011 23:36:35 -0500 Subject: Fixed an open resource error. --- pyramid/tests/test_config/test_assets.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pyramid/tests/test_config/test_assets.py b/pyramid/tests/test_config/test_assets.py index 1d0e89429..73f0a12ad 100644 --- a/pyramid/tests/test_config/test_assets.py +++ b/pyramid/tests/test_config/test_assets.py @@ -164,8 +164,8 @@ class TestOverrideProvider(unittest.TestCase): provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) expected = read_(os.path.join(here, resource_name)) - result = provider.get_resource_stream(None, resource_name) - self.assertEqual(result.read().replace('\r', ''), expected) + with provider.get_resource_stream(None, resource_name) as result: + self.assertEqual(result.read().replace('\r', ''), expected) def test_get_resource_string_no_overrides(self): import os @@ -222,9 +222,8 @@ class TestOverrideProvider(unittest.TestCase): provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) expected = read_(os.path.join(here, resource_name)) - result = provider.get_resource_stream(None, resource_name) - self.assertEqual(result.read(), expected) - result.close() + with provider.get_resource_stream(None, resource_name) as result: + self.assertEqual(result.read(), expected) def test_get_resource_string_override_returns_None(self): overrides = DummyOverrides(None) @@ -278,8 +277,8 @@ class TestOverrideProvider(unittest.TestCase): import pyramid.tests.test_config self._registerOverrides(overrides) provider = self._makeOne(pyramid.tests.test_config) - result = provider.get_resource_stream(None, 'test_assets.py') - self.assertEqual(result, 'value') + with provider.get_resource_stream(None, 'test_assets.py') as result: + self.assertEqual(result, 'value') def test_get_resource_string_override_returns_value(self): overrides = DummyOverrides('value') @@ -421,8 +420,9 @@ class TestPackageOverrides(unittest.TestCase): po.overrides= overrides here = os.path.dirname(os.path.abspath(__file__)) expected = read_(os.path.join(here, 'test_assets.py')) - self.assertEqual(po.get_stream('whatever').read().replace('\r', ''), - expected) + with po.get_stream('whatever') as stream: + self.assertEqual(stream.read().replace('\r', ''), + expected) def test_get_stream_file_doesnt_exist(self): overrides = [ DummyOverride(None), DummyOverride( -- cgit v1.2.3