Submitter | timeless@mozdev.org |
---|---|
Date | April 8, 2016, 4:22 p.m. |
Message ID | <295d79e7d8dd3da8e9ce.1460132566@waste.org> |
Download | mbox | patch |
Permalink | /patch/14439/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@patchwork.serpentine.com Delivered-To: patchwork@patchwork.serpentine.com Received: from mercurial.selenic.com (mercurial.selenic.com [192.81.134.36]) by bz.selenic.com (Postfix) with ESMTP id 680443BBDE for <patchwork@patchwork.serpentine.com>; Fri, 8 Apr 2016 12:22:58 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mercurial.selenic.com (Postfix) with ESMTP id 5C0602C153; Fri, 8 Apr 2016 12:22:58 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial.selenic.com ([127.0.0.1]) by localhost (mercurial.selenic.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id PtXCC0qRuFeS; Fri, 8 Apr 2016 12:22:57 -0400 (EDT) Received: from mercurial.selenic.com (localhost [IPv6:::1]) by mercurial.selenic.com (Postfix) with ESMTP id 56CD02C14D; Fri, 8 Apr 2016 12:22:56 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial.selenic.com (Postfix) with ESMTP id 970D92C14A for <mercurial-devel@mercurial-scm.org>; Fri, 8 Apr 2016 12:22:55 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial.selenic.com ([127.0.0.1]) by localhost (mercurial.selenic.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 7g1yIY9eiB_O for <mercurial-devel@mercurial-scm.org>; Fri, 8 Apr 2016 12:22:54 -0400 (EDT) Received: from waste.org (waste.org [173.11.57.241]) by mercurial.selenic.com (Postfix) with ESMTP id 393D52C083 for <mercurial-devel@mercurial-scm.org>; Fri, 8 Apr 2016 12:22:54 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id 9833B740D7 for <mercurial-devel@mercurial-scm.org>; Fri, 8 Apr 2016 11:22:53 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hnI05KoGFPmg for <mercurial-devel@mercurial-scm.org>; Fri, 8 Apr 2016 11:22:52 -0500 (CDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id 3BFC1740CD for <mercurial-devel@selenic.com>; Fri, 8 Apr 2016 11:22:46 -0500 (CDT) MIME-Version: 1.0 Subject: [PATCH 2 of 7] pycompat: fix demand import handling of Queue X-Mercurial-Node: 295d79e7d8dd3da8e9ce33611916574d7ddc0ad8 X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 7 Message-Id: <295d79e7d8dd3da8e9ce.1460132566@waste.org> X-Mercurial-Series-Id: <b4f3a8a501aa6134f5ef.1460132565@waste.org> In-Reply-To: <b4f3a8a501aa6134f5ef.1460132565@waste.org> References: <b4f3a8a501aa6134f5ef.1460132565@waste.org> User-Agent: Mercurial-patchbomb/3.7.3+652-ff0d3b6b287f Date: Fri, 08 Apr 2016 11:22:46 -0500 From: timeless <timeless@mozdev.org> To: mercurial-devel@mercurial-scm.org X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
timeless@mozdev.org - April 8, 2016, 4:22 p.m.
Patch
diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py --- a/mercurial/pycompat.py +++ b/mercurial/pycompat.py @@ -12,6 +12,7 @@ try: import Queue as _queue + _queue.Queue except ImportError: import queue as _queue empty = _queue.Empty