diff options
| author | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-05-18 21:40:44 -0500 |
|---|---|---|
| committer | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-05-18 21:40:44 -0500 |
| commit | 1f8970a20bb09a034754c24f3d21e7425b5105ca (patch) | |
| tree | ee22b8dad5adcaaa13f0233c07a741a0f7055a26 | |
| parent | dfdcf1b3e961f735f30c6e3efe47c303523660f0 (diff) | |
| parent | 2e7c71a65bde37e59773298f01b751c0bee32ecc (diff) | |
| download | pyramid-1f8970a20bb09a034754c24f3d21e7425b5105ca.tar.gz pyramid-1f8970a20bb09a034754c24f3d21e7425b5105ca.tar.bz2 pyramid-1f8970a20bb09a034754c24f3d21e7425b5105ca.zip | |
Merge pull request #2585 from berkerpeksag/simplify-win-check
Simplify Windows detection code
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | pyramid/compat.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 55fdf096b..762793d0b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -268,3 +268,5 @@ Contributors - Arian Maykon de A. Diógenes, 2016/04/13 - Vincent Férotin, 2016/05/08 + +- Berker Peksag, 2016/05/16 diff --git a/pyramid/compat.py b/pyramid/compat.py index 2bfbabb8e..3f38b88a6 100644 --- a/pyramid/compat.py +++ b/pyramid/compat.py @@ -3,10 +3,7 @@ import platform import sys import types -if platform.system() == 'Windows': # pragma: no cover - WIN = True -else: # pragma: no cover - WIN = False +WIN = platform.system() == 'Windows' try: # pragma: no cover import __pypy__ |