--- a/tests/dumbhttp.py Sun Dec 06 22:10:10 2015 -0800
+++ b/tests/dumbhttp.py Sun Dec 06 22:12:07 2015 -0800
@@ -1,13 +1,22 @@
#!/usr/bin/env python
+from __future__ import absolute_import
+
"""
Small and dumb HTTP server for use in tests.
"""
-from optparse import OptionParser
-import BaseHTTPServer, SimpleHTTPServer, signal, sys
+import optparse
+import BaseHTTPServer
+import signal
+import SimpleHTTPServer
+import sys
-from mercurial import cmdutil
+from mercurial import (
+ cmdutil,
+)
+
+OptionParser = optparse.OptionParser
class simplehttpservice(object):
def __init__(self, host, port):
--- a/tests/test-check-py3-compat.t Sun Dec 06 22:10:10 2015 -0800
+++ b/tests/test-check-py3-compat.t Sun Dec 06 22:12:07 2015 -0800
@@ -143,7 +143,6 @@
mercurial/util.py not using absolute_import
mercurial/windows.py not using absolute_import
setup.py not using absolute_import
- tests/dumbhttp.py not using absolute_import
tests/fakedirstatewritetime.py not using absolute_import
tests/fakepatchtime.py not using absolute_import
tests/filterpyflakes.py not using absolute_import