move WIN and PYPY tests into pyramid.util

5 files changed, 19 insertions, 18 deletions

diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py
deleted file mode 100644
index ec0ca7017..000000000
--- a/src/pyramid/compat.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import platform
-
-WIN = platform.system() == 'Windows'
-
-try:  # pragma: no cover
-    import __pypy__
-
-    PYPY = True
-except BaseException:  # pragma: no cover
-    __pypy__ = None
-    PYPY = False
diff --git a/src/pyramid/config/views.py b/src/pyramid/config/views.py
index 412e30304..ac531ecb2 100644
--- a/src/pyramid/config/views.py
+++ b/src/pyramid/config/views.py
@@ -33,7 +33,6 @@ from pyramid.interfaces import (
 from pyramid import renderers
 
 from pyramid.asset import resolve_asset_spec
-from pyramid.compat import WIN
 
 from pyramid.decorator import reify
 
@@ -54,7 +53,12 @@ from pyramid.url import parse_url_overrides
 
 from pyramid.view import AppendSlashNotFoundViewFactory
 
-from pyramid.util import as_sorted_tuple, is_nonstr_iter, TopologicalSorter
+from pyramid.util import (
+    as_sorted_tuple,
+    is_nonstr_iter,
+    TopologicalSorter,
+    WIN,
+)
 
 import pyramid.predicates
 import pyramid.viewderivers
diff --git a/src/pyramid/testing.py b/src/pyramid/testing.py
index 04497234b..6831ea4e2 100644
--- a/src/pyramid/testing.py
+++ b/src/pyramid/testing.py
@@ -8,8 +8,6 @@ from zope.interface import implementer, alsoProvides
 
 from pyramid.interfaces import IRequest, ISession
 
-from pyramid.compat import PYPY
-
 from pyramid.config import Configurator
 from pyramid.decorator import reify
 from pyramid.path import caller_package
@@ -28,7 +26,7 @@ from pyramid.threadlocal import get_current_registry, manager
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.request import CallbackMethodsMixin
 from pyramid.url import URLMethodsMixin
-from pyramid.util import InstancePropertyMixin, text_
+from pyramid.util import InstancePropertyMixin, PYPY, text_
 from pyramid.view import ViewMethodsMixin
 
 
diff --git a/src/pyramid/util.py b/src/pyramid/util.py
index ab46c91f7..1180fce83 100644
--- a/src/pyramid/util.py
+++ b/src/pyramid/util.py
@@ -2,12 +2,23 @@ from contextlib import contextmanager
 import functools
 from hmac import compare_digest
 import inspect
+import platform
 import weakref
 
 from pyramid.path import DottedNameResolver as _DottedNameResolver
 
 _marker = object()
 
+WIN = platform.system() == 'Windows'
+
+try:  # pragma: no cover
+    import __pypy__
+
+    PYPY = True
+except BaseException:  # pragma: no cover
+    __pypy__ = None
+    PYPY = False
+
 
 class DottedNameResolver(_DottedNameResolver):
     def __init__(
diff --git a/tests/test_url.py b/tests/test_url.py
index 4c761ce50..648f48d53 100644
--- a/tests/test_url.py
+++ b/tests/test_url.py
@@ -3,8 +3,7 @@ import unittest
 
 from pyramid import testing
 
-from pyramid.compat import WIN
-from pyramid.util import text_
+from pyramid.util import WIN, text_
 
 
 class TestURLMethodsMixin(unittest.TestCase):