[PATCH 2 of 8 v2] python3: handle queue/Queue divergence

[Yuya Nishihara]

On Tue, 29 Mar 2016 23:33:17 -0500, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1459196794 0
> #      Mon Mar 28 20:26:34 2016 +0000
> # Node ID 7d4296c48aaba89e3159186654ce95a0b0c96d48
> # Parent  72041f7fe902f71857e4eb08bf5755f8d83b65c3
> python3: handle queue/Queue divergence
> 
> diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
> --- a/mercurial/scmutil.py
> +++ b/mercurial/scmutil.py
> @@ -7,7 +7,6 @@
>  
>  from __future__ import absolute_import
>  
> -import Queue
>  import contextlib
>  import errno
>  import glob
> @@ -18,6 +17,11 @@
>  import tempfile
>  import threading
>  
> +try:
> +    import Queue as queue
> +except ImportError:
> +    import queue as queue

ImportError won't be raised here because of demandimport. The next cStringIO
patch has the same issue.