changeset 27360:6daa795ed32f

windows: use absolute_import
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 12 Dec 2015 23:19:38 -0800
parents a56c47ed3885
children 29f50344fa83
files mercurial/windows.py tests/test-check-py3-compat.t
diffstat 2 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/windows.py	Sat Dec 12 23:17:22 2015 -0800
+++ b/mercurial/windows.py	Sat Dec 12 23:19:38 2015 -0800
@@ -5,11 +5,23 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from i18n import _
-import osutil, encoding
-import errno, msvcrt, os, re, stat, sys, _winreg
+from __future__ import absolute_import
 
+import _winreg
+import errno
+import msvcrt
+import os
+import re
+import stat
+import sys
 import win32
+
+from .i18n import _
+from . import (
+    encoding,
+    osutil,
+)
+
 executablepath = win32.executablepath
 getuser = win32.getuser
 hidewindow = win32.hidewindow
--- a/tests/test-check-py3-compat.t	Sat Dec 12 23:17:22 2015 -0800
+++ b/tests/test-check-py3-compat.t	Sat Dec 12 23:19:38 2015 -0800
@@ -127,7 +127,6 @@
   mercurial/scmutil.py not using absolute_import
   mercurial/scmwindows.py not using absolute_import
   mercurial/store.py not using absolute_import
-  mercurial/windows.py not using absolute_import
   setup.py not using absolute_import
   tests/filterpyflakes.py requires print_function
   tests/generate-working-copy-states.py requires print_function