[PATCH 2 of 8 v2] python3: handle queue/Queue divergence
timeless
timeless at mozdev.org
Wed Mar 30 00:33:17 EDT 2016
# 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
+
from .i18n import _
from .node import wdirrev
from . import (
@@ -1320,7 +1324,7 @@
ui.debug('starting %d threads for background file closing\n' %
threadcount)
- self._queue = Queue.Queue(maxsize=maxqueue)
+ self._queue = queue.Queue(maxsize=maxqueue)
self._running = True
for i in range(threadcount):
@@ -1352,7 +1356,7 @@
except Exception as e:
# Stash so can re-raise from main thread later.
self._threadexception = e
- except Queue.Empty:
+ except queue.Empty:
if not self._running:
break
diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -186,11 +186,11 @@
hgext/win*text.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
mercurial/bookmarks.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
- mercurial/branchmap.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
+ mercurial/branchmap.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
mercurial/byterange.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
- mercurial/changegroup.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
+ mercurial/changegroup.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/changelog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
mercurial/cmdutil.py: error importing module: <ImportError> No module named 'cStringIO' (line *) (glob)
mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
@@ -248,7 +248,7 @@
mercurial/repoview.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/revlog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
mercurial/revset.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
- mercurial/scmutil.py: error importing module: <ImportError> No module named 'Queue' (line *) (glob)
+ mercurial/scmutil.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
mercurial/similar.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
mercurial/simplemerge.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
@@ -257,7 +257,7 @@
mercurial/sslutil.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/statichttprepo.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
mercurial/store.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
- mercurial/streamclone.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
+ mercurial/streamclone.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/subrepo.py: error importing: <ImportError> No module named 'cStringIO' (error at cmdutil.py:*) (glob)
mercurial/tagmerge.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
mercurial/tags.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
More information about the Mercurial-devel
mailing list