Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update _appengine_environ.py #1471

Closed
wants to merge 53 commits into from
Closed
Changes from 6 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
00093d6
Update _appengine_environ.py
wittfabian Nov 3, 2018
6b17c92
Update _appengine_environ.py
wittfabian Nov 6, 2018
2717054
Update _appengine_environ.py
wittfabian Nov 7, 2018
a9f55e1
Update _appengine_environ.py
wittfabian Nov 7, 2018
e0b2433
Merge pull request #1 from urllib3/master
wittfabian Nov 22, 2018
0c6d7ad
Use APPENGINE_RUNTIME in is_appengine
wittfabian Nov 25, 2018
00b0be0
Update _appengine_environ.py
wittfabian Nov 26, 2018
5521a8e
fixed syntax error
wittfabian Nov 27, 2018
dab99a6
Merge pull request #2 from urllib3/master
wittfabian Mar 20, 2019
edfd345
Improve CI stability for timeouts and branch coverage (#1554)
pquentin Mar 23, 2019
46331f9
Encode field names using HTML5 by default instead of RFC 2231 (#1492)
Robbt Mar 23, 2019
c427daf
Remove mercurial files (#1558)
pquentin Mar 27, 2019
1ebcbc2
Apply changes from 1.24.2 release to master (#1566)
sethmlarson Apr 19, 2019
1d3e60e
Update urllib3.contrib.socks documentation (#1567)
sethmlarson Apr 19, 2019
5d52370
Use rfc3986.validator.Validator for parse_url (#1531)
sethmlarson Apr 21, 2019
bbeeae2
Apply lowercasing before IDNA-encoding (#1569)
sethmlarson Apr 22, 2019
c3157af
Release 1.25 (#1568)
sethmlarson Apr 22, 2019
0144514
Restore dev version (#1570)
sethmlarson Apr 22, 2019
ecb1c7a
Add compatibility with Google's 'Brotli' package (#1572)
elprans Apr 22, 2019
1e46888
Add integration tests for Google's Brotli package (#1573)
sethmlarson Apr 23, 2019
d7ece60
Change deploy stage to have it's own job and not run unit tests (#1574)
sethmlarson Apr 23, 2019
ff8f721
Upgrade rfc3986 to v1.3.1 (#1578)
sethmlarson Apr 24, 2019
64e413f
Add first-class support for Brotli package (#1579)
sethmlarson Apr 24, 2019
85e7798
Release 1.25.1 (#1581)
sethmlarson Apr 24, 2019
2001292
Switch to Nox (#1580)
theacodes Apr 24, 2019
dae790c
Don't require branch = master for tag pushes (#1584)
sethmlarson Apr 25, 2019
a0d2bfd
is_ipaddress shouldn't detect IPvFuture addresses (#1583)
sethmlarson Apr 25, 2019
35b4caa
use import for is_appengine check
wittfabian Apr 25, 2019
057e455
Merge remote-tracking branch 'origin/master'
wittfabian Apr 25, 2019
685914d
Update _appengine_environ.py
wittfabian Nov 3, 2018
eb94d9f
Update _appengine_environ.py
wittfabian Nov 6, 2018
0e92902
Update _appengine_environ.py
wittfabian Nov 7, 2018
35ed29f
Update _appengine_environ.py
wittfabian Nov 7, 2018
875f07e
Use APPENGINE_RUNTIME in is_appengine
wittfabian Nov 25, 2018
678f64e
Update _appengine_environ.py
wittfabian Nov 26, 2018
53a62f1
fixed syntax error
wittfabian Nov 27, 2018
6daeb6c
use import for is_appengine check
wittfabian Apr 25, 2019
d98e631
Merge branch 'master' of https://github.com/wittfabian/urllib3
wittfabian Apr 25, 2019
a74c9cf
Percent-encode invalid characters with request target (#1586)
sethmlarson Apr 28, 2019
49eea80
Release 1.25.2 (#1588)
sethmlarson Apr 29, 2019
fb706cb
Update _appengine_environ.py
wittfabian Nov 3, 2018
602fe61
Update _appengine_environ.py
wittfabian Nov 6, 2018
7dc72c5
Update _appengine_environ.py
wittfabian Nov 7, 2018
febec12
Update _appengine_environ.py
wittfabian Nov 7, 2018
3bc64d7
Use APPENGINE_RUNTIME in is_appengine
wittfabian Nov 25, 2018
5f4361e
Update _appengine_environ.py
wittfabian Nov 26, 2018
ef821ef
fixed syntax error
wittfabian Nov 27, 2018
3328ebd
use import for is_appengine check
wittfabian Apr 25, 2019
48abb93
Update _appengine_environ.py
wittfabian Nov 3, 2018
806f172
Update _appengine_environ.py
wittfabian Nov 6, 2018
7b40462
Update _appengine_environ.py
wittfabian Nov 7, 2018
7d66edc
rebase
wittfabian May 2, 2019
cdf9aa5
Merge remote-tracking branch 'origin/master'
wittfabian May 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/urllib3/contrib/_appengine_environ.py
Expand Up @@ -6,24 +6,20 @@


def is_appengine():
return (is_local_appengine() or
is_prod_appengine() or
is_prod_appengine_mvms())
return 'APPENGINE_RUNTIME' in os.environ


def is_appengine_sandbox():
return is_appengine() and not is_prod_appengine_mvms()


def is_local_appengine():
return ('APPENGINE_RUNTIME' in os.environ and
'Development/' in os.environ['SERVER_SOFTWARE'])
return ('SERVER_SOFTWARE' not in os.environ or
wittfabian marked this conversation as resolved.
Show resolved Hide resolved
os.environ['SERVER_SOFTWARE'].startswith('Development'))


def is_prod_appengine():
return ('APPENGINE_RUNTIME' in os.environ and
'Google App Engine/' in os.environ['SERVER_SOFTWARE'] and
not is_prod_appengine_mvms())
return not is_local_appengine()
wittfabian marked this conversation as resolved.
Show resolved Hide resolved


def is_prod_appengine_mvms():
Expand Down