diff options
| author | Michael Merickel <michael@merickel.org> | 2011-09-22 23:27:04 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2011-09-22 23:27:53 -0500 |
| commit | 2544cfc1e50ac12a4c4e017bde43770d903c8eb1 (patch) | |
| tree | 92314eff01a584e3e475b255dd37d5b675afa2c9 | |
| parent | f7b9be3fea04b9bdaf65e52b0baafa406bcaf1c0 (diff) | |
| download | pyramid-2544cfc1e50ac12a4c4e017bde43770d903c8eb1.tar.gz pyramid-2544cfc1e50ac12a4c4e017bde43770d903c8eb1.tar.bz2 pyramid-2544cfc1e50ac12a4c4e017bde43770d903c8eb1.zip | |
Fixed some files to be read as binary.
| -rw-r--r-- | pyramid/tests/test_config/test_assets.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pyramid/tests/test_config/test_assets.py b/pyramid/tests/test_config/test_assets.py index a07753118..1d0e89429 100644 --- a/pyramid/tests/test_config/test_assets.py +++ b/pyramid/tests/test_config/test_assets.py @@ -163,7 +163,7 @@ class TestOverrideProvider(unittest.TestCase): import pyramid.tests.test_config provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, resource_name)).read() + expected = read_(os.path.join(here, resource_name)) result = provider.get_resource_stream(None, resource_name) self.assertEqual(result.read().replace('\r', ''), expected) @@ -173,7 +173,7 @@ class TestOverrideProvider(unittest.TestCase): import pyramid.tests.test_config provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, resource_name)).read() + expected = read_(os.path.join(here, resource_name)) result = provider.get_resource_string(None, resource_name) self.assertEqual(result.replace('\r', ''), expected) @@ -221,9 +221,10 @@ class TestOverrideProvider(unittest.TestCase): import pyramid.tests.test_config provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, resource_name)).read() + expected = read_(os.path.join(here, resource_name)) result = provider.get_resource_stream(None, resource_name) self.assertEqual(result.read(), expected) + result.close() def test_get_resource_string_override_returns_None(self): overrides = DummyOverrides(None) @@ -233,7 +234,7 @@ class TestOverrideProvider(unittest.TestCase): import pyramid.tests.test_config provider = self._makeOne(pyramid.tests.test_config) here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, resource_name)).read() + expected = read_(os.path.join(here, resource_name)) result = provider.get_resource_string(None, resource_name) self.assertEqual(result, expected) @@ -419,7 +420,7 @@ class TestPackageOverrides(unittest.TestCase): po = self._makeOne(package) po.overrides= overrides here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, 'test_assets.py')).read() + expected = read_(os.path.join(here, 'test_assets.py')) self.assertEqual(po.get_stream('whatever').read().replace('\r', ''), expected) @@ -439,7 +440,7 @@ class TestPackageOverrides(unittest.TestCase): po = self._makeOne(package) po.overrides= overrides here = os.path.dirname(os.path.abspath(__file__)) - expected = open(os.path.join(here, 'test_assets.py')).read() + expected = read_(os.path.join(here, 'test_assets.py')) self.assertEqual(po.get_string('whatever').replace('\r', ''), expected) def test_get_string_file_doesnt_exist(self): @@ -587,3 +588,8 @@ class DummyUnderOverride: self.override_package = override_package self.override_prefix = override_prefix +def read_(src): + with open(src, 'rb') as f: + contents = f.read() + return contents + |