diff options
| author | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-09 21:02:54 +0100 |
|---|---|---|
| committer | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-09 21:02:54 +0100 |
| commit | 3a780b6f0151cd4dcd25bd81153147957b999249 (patch) | |
| tree | 50843ba54c8d2121af24c799152ed8f6759eb142 | |
| parent | 856925f3ca4de6ca5a709aa8f3cd10a4962573a3 (diff) | |
| parent | 26f201e7271565a3f414bcf53252a82ed06ce833 (diff) | |
| download | pystache-3a780b6f0151cd4dcd25bd81153147957b999249.tar.gz | |
Merge branch 'master' into development
Conflicts:
pystache/__init__.py
setup.py
| -rw-r--r-- | pystache/tests/test_specloader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pystache/tests/test_specloader.py b/pystache/tests/test_specloader.py index d934987..cacc0fc 100644 --- a/pystache/tests/test_specloader.py +++ b/pystache/tests/test_specloader.py @@ -383,11 +383,11 @@ class TemplateSpecTests(unittest.TestCase, AssertPathsMixin): loader = self._make_loader() view = SampleView() - view.template_rel_path = 'foo/bar.txt' + view.template_rel_path = os.path.join('foo', 'bar.txt') self.assertTrue(loader._find_relative(view)[0] is not None) actual = loader._find(view) - expected = os.path.join(DATA_DIR, 'foo/bar.txt') + expected = os.path.join(DATA_DIR, 'foo', 'bar.txt') self.assertPaths(actual, expected) |