diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-02 17:23:02 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-02 17:23:02 -0400 |
| commit | 8f1ef1bc549b7e52d4d88c0b84f49fb610b52a30 (patch) | |
| tree | 9026b921b388357645553e474df6d61ae40066b4 | |
| parent | 1723f85a3cc34f6454913a1a8b6b5c8954b5d689 (diff) | |
| download | external_python_mako-8f1ef1bc549b7e52d4d88c0b84f49fb610b52a30.tar.gz external_python_mako-8f1ef1bc549b7e52d4d88c0b84f49fb610b52a30.tar.bz2 external_python_mako-8f1ef1bc549b7e52d4d88c0b84f49fb610b52a30.zip | |
- add a skip for pypy
| -rw-r--r-- | mako/util.py | 1 | ||||
| -rw-r--r-- | test/test_util.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mako/util.py b/mako/util.py index df4bf4b..9b7f01a 100644 --- a/mako/util.py +++ b/mako/util.py @@ -13,6 +13,7 @@ py26 = sys.version_info >= (2, 6) py24 = sys.version_info >= (2, 4) and sys.version_info < (2, 5) jython = sys.platform.startswith('java') win32 = sys.platform.startswith('win') +pypy = hasattr(sys, 'pypy_version_info') if py3k: from io import StringIO diff --git a/test/test_util.py b/test/test_util.py index 5c4f95f..04b2c09 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -3,7 +3,7 @@ import os import unittest from mako import util -from test import eq_ +from test import eq_, skip_if class UtilTest(unittest.TestCase): def test_fast_buffer_write(self): @@ -34,6 +34,7 @@ class UtilTest(unittest.TestCase): data = util.read_file(fn, 'rb') self.failUnless('test_util' in str(data)) # str() for py3k + @skip_if(lambda: util.pypy, "Pypy does this differently") def test_load_module(self): fn = os.path.join(os.path.dirname(__file__), 'test_util.py') module = util.load_module('mako.template', fn) |