summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-27 22:30:07 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-27 22:30:07 -0800
commitdf7f1d3e00a9f0de1c631422b91cac3d074ddc0f (patch)
tree5f89a771d763cbbec4e2e85ce3076bde7353adb5 /pym/portage
parenta0f22daa7cf359aac776a45bbc60d22dcd947034 (diff)
downloadportage-df7f1d3e00a9f0de1c631422b91cac3d074ddc0f.tar.gz
portage-df7f1d3e00a9f0de1c631422b91cac3d074ddc0f.tar.bz2
portage-df7f1d3e00a9f0de1c631422b91cac3d074ddc0f.zip
PipeReaderBlockingIO handle threading ImportError
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/tests/process/test_PopenProcessBlockingIO.py1
-rw-r--r--pym/portage/util/_async/PipeReaderBlockingIO.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/tests/process/test_PopenProcessBlockingIO.py b/pym/portage/tests/process/test_PopenProcessBlockingIO.py
index 9cdad326d..9ee291a39 100644
--- a/pym/portage/tests/process/test_PopenProcessBlockingIO.py
+++ b/pym/portage/tests/process/test_PopenProcessBlockingIO.py
@@ -6,6 +6,7 @@ import subprocess
try:
import threading
except ImportError:
+ # dummy_threading will not suffice
threading = None
from portage import os
diff --git a/pym/portage/util/_async/PipeReaderBlockingIO.py b/pym/portage/util/_async/PipeReaderBlockingIO.py
index 8ce2ec51b..b06adf6ed 100644
--- a/pym/portage/util/_async/PipeReaderBlockingIO.py
+++ b/pym/portage/util/_async/PipeReaderBlockingIO.py
@@ -1,7 +1,11 @@
# Copyright 2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-import threading
+try:
+ import threading
+except ImportError:
+ # dummy_threading will not suffice
+ threading = None
from portage import os
from _emerge.AbstractPollTask import AbstractPollTask