From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5C6621381FB for ; Fri, 28 Dec 2012 06:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35CE121C036; Fri, 28 Dec 2012 06:30:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF42C21C036 for ; Fri, 28 Dec 2012 06:30:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9745C33DA2E for ; Fri, 28 Dec 2012 06:30:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 03F46E543D for ; Fri, 28 Dec 2012 06:30:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1356676207.df7f1d3e00a9f0de1c631422b91cac3d074ddc0f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/process/, pym/portage/util/_async/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/process/test_PopenProcessBlockingIO.py pym/portage/util/_async/PipeReaderBlockingIO.py X-VCS-Directories: pym/portage/tests/process/ pym/portage/util/_async/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: df7f1d3e00a9f0de1c631422b91cac3d074ddc0f X-VCS-Branch: master Date: Fri, 28 Dec 2012 06:30:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 335d1d29-e167-4bd4-ae66-e07577f15314 X-Archives-Hash: e6ace5ce3f5fea4561c80de6423842a7 commit: df7f1d3e00a9f0de1c631422b91cac3d074ddc0f Author: Zac Medico gentoo org> AuthorDate: Fri Dec 28 06:30:07 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Dec 28 06:30:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=df7f1d3e PipeReaderBlockingIO handle threading ImportError --- .../tests/process/test_PopenProcessBlockingIO.py | 1 + pym/portage/util/_async/PipeReaderBlockingIO.py | 6 +++++- 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 9cdad32..9ee291a 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 8ce2ec5..b06adf6 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