Revert "Get rid of monkey patching work around for Python 2 in main.py"
This does not work, greenthread just hangs. Needs further investigation as part of 1.1 series. This reverts commit 2e459037f25f5484ec9cb568d38b6a9abf3cfb5a. Change-Id: I952e8307cec534aa09f48a3d476f58b338b9aea8
This commit is contained in:
parent
3ea013c5f3
commit
f6b2241864
@ -13,9 +13,9 @@
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import ironic_discoverd.test # noqa - pulls in monkey patching
|
||||
|
||||
import eventlet
|
||||
eventlet.monkey_patch(thread=False)
|
||||
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
|
@ -11,10 +11,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import sys
|
||||
|
||||
import eventlet
|
||||
eventlet.monkey_patch(thread=(sys.version_info < (3, 3)))
|
||||
eventlet.monkey_patch(thread=False)
|
||||
|
||||
import argparse
|
||||
import functools
|
||||
|
@ -12,4 +12,4 @@
|
||||
# limitations under the License.
|
||||
|
||||
import eventlet
|
||||
eventlet.monkey_patch(thread=False) # thread=True breaks func tests
|
||||
eventlet.monkey_patch(thread=False)
|
||||
|
Loading…
x
Reference in New Issue
Block a user