Skip to content

Commit 35aaddf

Browse files
committed
Merge pull request #51 from jhgg/parallel-execution
Concurrent Execution Using Defers + Asyncio, Gevent & Synchronous Support
2 parents 6a121fc + dd2bb3d commit 35aaddf

23 files changed

+1910
-411
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ python:
77
- 3.5
88
- pypy
99
install:
10-
- pip install pytest-cov coveralls flake8 import-order
10+
- pip install pytest-cov coveralls flake8 import-order gevent==1.1b5
1111
- pip install pytest>=2.7.3 --upgrade
1212
- pip install -e .
1313
script:
@@ -18,4 +18,7 @@ after_success:
1818
matrix:
1919
include:
2020
- python: "3.5"
21-
script: import-order graphql
21+
script:
22+
- flake8
23+
- import-order graphql
24+
- py.test --cov=graphql tests tests_py35

graphql/core/compat.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import sys
2+
13
try:
24
str_type = basestring
35
str_is_unicode = False
@@ -10,10 +12,14 @@
1012
except NameError:
1113
unichr = chr
1214

13-
1415
if str_is_unicode:
1516
def native_str(s, errors=None):
1617
return s
1718
else:
1819
def native_str(s, errors=None):
1920
return s.encode(errors=errors)
21+
22+
if sys.version_info < (3, 0):
23+
PY3 = False
24+
else:
25+
PY3 = True

0 commit comments

Comments
 (0)