From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDDDE1382C5 for ; Sun, 15 Apr 2018 22:32:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8AF7E0869; Sun, 15 Apr 2018 22:32:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C492AE0869 for ; Sun, 15 Apr 2018 22:32:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C01C335C63 for ; Sun, 15 Apr 2018 22:32:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13517279 for ; Sun, 15 Apr 2018 22:32:34 +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: <1523831467.18d8abb063d7730fbb86d451489dc2acf36c1327.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/_eventloop/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_eventloop/EventLoop.py X-VCS-Directories: pym/portage/util/_eventloop/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 18d8abb063d7730fbb86d451489dc2acf36c1327 X-VCS-Branch: master Date: Sun, 15 Apr 2018 22:32:34 +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: 3c69831f-4d9c-455f-b876-d899fedbe3cb X-Archives-Hash: c52a72af2fa169d4f4511db3538e01ae commit: 18d8abb063d7730fbb86d451489dc2acf36c1327 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 15 22:25:03 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 15 22:31:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=18d8abb0 EventLoop: fix AttributeError in add/remove_reader Fixes: 24f861173ebe ("EventLoop: implement add/remove_reader/writer for asyncio compat (bug 649588)") pym/portage/util/_eventloop/EventLoop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/_eventloop/EventLoop.py b/pym/portage/util/_eventloop/EventLoop.py index a928f3138..32dc2fc9d 100644 --- a/pym/portage/util/_eventloop/EventLoop.py +++ b/pym/portage/util/_eventloop/EventLoop.py @@ -609,7 +609,7 @@ class EventLoop(object): Stop watching the file descriptor for read availability. """ handler = self._poll_event_handlers.get(fd) - if fd is not None: + if handler is not None: return self.source_remove(handler.source_id) return False @@ -627,7 +627,7 @@ class EventLoop(object): Stop watching the file descriptor for write availability. """ handler = self._poll_event_handlers.get(fd) - if fd is not None: + if handler is not None: return self.source_remove(handler.source_id) return False