diff options
| -rw-r--r-- | pyramid/compat.py | 37 | ||||
| -rw-r--r-- | pyramid/paster.py | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/__init__.py | 4 | ||||
| -rw-r--r-- | pyramid/testing.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_init.py | 4 |
5 files changed, 16 insertions, 33 deletions
diff --git a/pyramid/compat.py b/pyramid/compat.py index a6f7f025e..a19c61034 100644 --- a/pyramid/compat.py +++ b/pyramid/compat.py @@ -1,6 +1,13 @@ import sys import types +try: # pragma: no cover + import __pypy__ + PYPY = True +except: # pragma: no cover + __pypy__ = None + PYPY = False + try: import cPickle as pickle except ImportError: # pragma: no cover @@ -24,8 +31,6 @@ if PY3: # pragma: no cover text_type = str binary_type = bytes long = int - def ords_(b): - return b else: string_types = basestring, integer_types = (int, long) @@ -33,8 +38,6 @@ else: text_type = unicode binary_type = str long = long - def ords_(s): - return [ord(x) for x in s] def text_(s, encoding='latin-1', errors='strict'): if isinstance(s, binary_type): @@ -57,21 +60,6 @@ else: return s.encode(encoding, errors) return str(s) -if PY3: # pragma: no cover - fsenc = sys.getfilesystemencoding() - def text_to_wsgi(u): - # On Python 3, convert an environment variable to a WSGI - # "bytes-as-unicode" string - return u.encode(fsenc, 'surrogateescape').decode('latin-1') -else: - def text_to_wsgi(u): - return u.encode('latin-1', 'surrogateescape') - -try: - from queue import Queue, Empty -except ImportError: - from Queue import Queue, Empty - try: # pragma: no cover from urllib import parse urlparse = parse @@ -180,17 +168,12 @@ else: return d.iterkeys() -if PY3: +if PY3: # pragma: no cover def map_(*arg): return list(map(*arg)) else: map_ = map -try: - import __pypy__ -except: - __pypy__ = None - if PY3: # pragma: no cover def is_nonstr_iter(v): if isinstance(v, str): @@ -205,8 +188,8 @@ if PY3: # pragma: no cover else: im_func = 'im_func' -try: +try: # pragma: no cover import configparser -except ImportError: +except ImportError: # pragma: no cover import ConfigParser configparser = ConfigParser diff --git a/pyramid/paster.py b/pyramid/paster.py index 0085c279e..ab764ba59 100644 --- a/pyramid/paster.py +++ b/pyramid/paster.py @@ -12,7 +12,7 @@ except ImportError: # pragma: no cover try: from paste.script.command import Command -except ImportError: +except ImportError: # pragma: no cover class Command: pass diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py index e00a9f83b..1595c37eb 100644 --- a/pyramid/scaffolds/__init__.py +++ b/pyramid/scaffolds/__init__.py @@ -2,13 +2,13 @@ import os try: from paste.script.templates import Template -except ImportError: +except ImportError: # pragma: no cover class Template: pass try: from paste.util.template import paste_script_template_renderer -except ImportError: +except ImportError: # pragma: no cover def paste_script_template_renderer(): pass diff --git a/pyramid/testing.py b/pyramid/testing.py index 338eff9e9..862d31459 100644 --- a/pyramid/testing.py +++ b/pyramid/testing.py @@ -32,7 +32,7 @@ try: import zope.component zope.component have_zca = True -except ImportError: +except ImportError: # pragma: no cover have_zca = False _marker = object() diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py index 0decd28ad..d3db47369 100644 --- a/pyramid/tests/test_config/test_init.py +++ b/pyramid/tests/test_config/test_init.py @@ -2,7 +2,7 @@ import unittest import os -from pyramid.compat import __pypy__ +from pyramid.compat import PYPY from pyramid.tests.test_config import dummy_tween_factory from pyramid.tests.test_config import dummy_include @@ -66,7 +66,7 @@ class ConfiguratorTests(unittest.TestCase): config.commit() self.assertTrue(config.registry.getUtility(IRendererFactory, 'json')) self.assertTrue(config.registry.getUtility(IRendererFactory, 'string')) - if not __pypy__: + if not PYPY: self.assertTrue(config.registry.getUtility(IRendererFactory, '.pt')) self.assertTrue(config.registry.getUtility(IRendererFactory,'.txt')) self.assertTrue(config.registry.getUtility(IRendererFactory, '.mak')) |