Merge "Make call-count profiling tests on osx have their own platform key"

3 files changed, 5 insertions, 0 deletions

diff --git a/lib/sqlalchemy/testing/profiling.py b/lib/sqlalchemy/testing/profiling.py
index c50ce1e15..c7ccf4688 100644
--- a/lib/sqlalchemy/testing/profiling.py
+++ b/lib/sqlalchemy/testing/profiling.py
@@ -23,6 +23,7 @@ import sys
 from . import config
 from .util import gc_collect
 from ..util import cpython
+from ..util import osx
 from ..util import win32
 
 
@@ -106,6 +107,8 @@ class ProfileStatsFile(object):
 
         if win32:
             platform_tokens.append("win")
+        if osx:
+            platform_tokens.append("osx")
         platform_tokens.append(
             "nativeunicode"
             if config.db.dialect.convert_unicode
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index b2407ea18..cea9c4f66 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -60,6 +60,7 @@ from .compat import itertools_filter  # noqa
 from .compat import itertools_filterfalse  # noqa
 from .compat import namedtuple  # noqa
 from .compat import next  # noqa
+from .compat import osx  # noqa
 from .compat import parse_qsl  # noqa
 from .compat import perf_counter  # noqa
 from .compat import pickle  # noqa
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 806ef8ae1..88e3c1640 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -23,6 +23,7 @@ py2k = sys.version_info < (3, 0)
 
 cpython = platform.python_implementation() == "CPython"
 win32 = sys.platform.startswith("win")
+osx = sys.platform.startswith("darwin")
 
 has_refcount_gc = bool(cpython)