diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-08-07 17:27:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-08-07 17:27:15 +0000 |
| commit | 40d64f3a525b14272b7354c72d7f84f6b00796f9 (patch) | |
| tree | 350b7222e5a2e7c1e1f1e546362f921c84351d88 /lib/sqlalchemy | |
| parent | a25d122eae8bda79af9f596d2c51d4d1e2dfd30f (diff) | |
| parent | 24a9e6974c177e90d2213080b1f6d8270d78f69b (diff) | |
| download | sqlalchemy-40d64f3a525b14272b7354c72d7f84f6b00796f9.tar.gz | |
Merge "Add complete platform data to profiling data"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/testing/profiling.py | 19 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/compat.py | 1 |
3 files changed, 9 insertions, 12 deletions
diff --git a/lib/sqlalchemy/testing/profiling.py b/lib/sqlalchemy/testing/profiling.py index c7ccf4688..f52827ca5 100644 --- a/lib/sqlalchemy/testing/profiling.py +++ b/lib/sqlalchemy/testing/profiling.py @@ -22,9 +22,6 @@ import sys from . import config from .util import gc_collect -from ..util import cpython -from ..util import osx -from ..util import win32 try: @@ -99,16 +96,14 @@ class ProfileStatsFile(object): # keep it at 2.7, 3.1, 3.2, etc. for now. py_version = ".".join([str(v) for v in sys.version_info[0:2]]) - if not cpython: - platform_tokens = [platform.python_implementation(), py_version] - else: - platform_tokens = [py_version] - platform_tokens.append(dbapi_key) + platform_tokens = [ + platform.machine(), + platform.system().lower(), + platform.python_implementation().lower(), + py_version, + dbapi_key, + ] - 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 42992af13..ce9602745 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -44,6 +44,7 @@ from ._collections import UniqueAppender # noqa from ._collections import update_copy # noqa from ._collections import WeakPopulateDict # noqa from ._collections import WeakSequence # noqa +from .compat import arm # noqa from .compat import b # noqa from .compat import b64decode # noqa from .compat import b64encode # noqa diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 88e3c1640..b5e6b0538 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -24,6 +24,7 @@ py2k = sys.version_info < (3, 0) cpython = platform.python_implementation() == "CPython" win32 = sys.platform.startswith("win") osx = sys.platform.startswith("darwin") +arm = "aarch" in platform.machine().lower() has_refcount_gc = bool(cpython) |