openstack/neutron
Code Issues Proposed changes

Revert "monkey patch stdlib before importing other modules"

Browse Source 
The projects that depend on Neutron do not play nicely with this.

This reverts commit 24b11ded7f.

Change-Id: Ic7afd7de9db97cc3a085bc842a2d990519cf42f6
This commit is contained in:
armando-migliaccio
2015-02-11 17:25:56 -08:00
parent 5e69e9a18c
commit c229b58cf2
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/__init__.py
View File

@@ -14,11 +14,6 @@
# under the License. # under the License.
import gettext import gettext
import os
if not os.environ.get('NO_EVENTLET'):
import eventlet
eventlet.monkey_patch()
gettext.install('neutron', unicode=1) gettext.install('neutron', unicode=1)

4
run_tests.sh
View File

@@ -179,7 +179,7 @@ function warn_on_flake8_without_venv {
function run_pep8 { function run_pep8 {
echo "Running flake8 ..." echo "Running flake8 ..."
warn_on_flake8_without_venv warn_on_flake8_without_venv
NO_EVENTLET=1 ${wrapper} flake8 ${wrapper} flake8
} }
function run_pep8_changed { function run_pep8_changed {
@@ -192,7 +192,7 @@ function run_pep8_changed {
local files=$(git diff --name-only $target | tr '\n' ' ') local files=$(git diff --name-only $target | tr '\n' ' ')
echo "Running flake8 on ${files}" echo "Running flake8 on ${files}"
warn_on_flake8_without_venv warn_on_flake8_without_venv
diff -u --from-file /dev/null ${files} | NO_EVENTLET=1 ${wrapper} flake8 --diff diff -u --from-file /dev/null ${files} | ${wrapper} flake8 --diff
} }

1
tox.ini
View File

@@ -49,7 +49,6 @@ sitepackages = True
downloadcache = ~/cache/pip downloadcache = ~/cache/pip
[testenv:pep8] [testenv:pep8]
setenv = NO_EVENTLET=1
commands = commands =
# If it is easier to add a check via a shell script, consider adding it in this file # If it is easier to add a check via a shell script, consider adding it in this file
sh ./tools/misc-sanity-checks.sh sh ./tools/misc-sanity-checks.sh