diff --git a/testing/mozbase/mozprocess/mozprocess/__init__.py b/testing/mozbase/mozprocess/mozprocess/__init__.py index 6f4ae4945077..a2991604b8e5 100644 --- a/testing/mozbase/mozprocess/mozprocess/__init__.py +++ b/testing/mozbase/mozprocess/mozprocess/__init__.py @@ -2,4 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -from processhandler import * +from __future__ import absolute_import + +from .processhandler import * diff --git a/testing/mozbase/mozprocess/mozprocess/pid.py b/testing/mozbase/mozprocess/mozprocess/pid.py index 6a1694bfbc49..06b73ccbeda1 100755 --- a/testing/mozbase/mozprocess/mozprocess/pid.py +++ b/testing/mozbase/mozprocess/mozprocess/pid.py @@ -4,7 +4,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -import os +from __future__ import absolute_import + import mozinfo import shlex import subprocess diff --git a/testing/mozbase/mozprocess/mozprocess/processhandler.py b/testing/mozbase/mozprocess/mozprocess/processhandler.py index 8268e67208d6..ba1fa7ee5f34 100644 --- a/testing/mozbase/mozprocess/mozprocess/processhandler.py +++ b/testing/mozbase/mozprocess/mozprocess/processhandler.py @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. +from __future__ import absolute_import + import os -import re -import select import signal import subprocess import sys diff --git a/testing/mozbase/mozprocess/mozprocess/qijo.py b/testing/mozbase/mozprocess/mozprocess/qijo.py index 1ac88430ce3c..2e9236d55609 100644 --- a/testing/mozbase/mozprocess/mozprocess/qijo.py +++ b/testing/mozbase/mozprocess/mozprocess/qijo.py @@ -2,6 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. +from __future__ import absolute_import + from ctypes import c_void_p, POINTER, sizeof, Structure, windll, WinError, WINFUNCTYPE, addressof, c_size_t, c_ulong from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LARGE_INTEGER diff --git a/testing/mozbase/mozprocess/mozprocess/winprocess.py b/testing/mozbase/mozprocess/mozprocess/winprocess.py index 6f3afc8de32a..c345125c3f92 100644 --- a/testing/mozbase/mozprocess/mozprocess/winprocess.py +++ b/testing/mozbase/mozprocess/mozprocess/winprocess.py @@ -34,9 +34,11 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -from ctypes import c_void_p, POINTER, sizeof, Structure, Union, windll, WinError, WINFUNCTYPE, c_ulong -from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LPCWSTR, LPWSTR, UINT, WORD, ULONG -from qijo import QueryInformationJobObject +from __future__ import mozprocess + +from ctypes import c_void_p, POINTER, sizeof, Structure, windll, WinError, WINFUNCTYPE, c_ulong +from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LPCWSTR, LPWSTR, UINT, WORD +from .qijo import QueryInformationJobObject LPVOID = c_void_p LPBYTE = POINTER(BYTE) diff --git a/testing/mozbase/mozprocess/mozprocess/wpk.py b/testing/mozbase/mozprocess/mozprocess/wpk.py index 8c142864b99f..5d707c2e7b7d 100644 --- a/testing/mozbase/mozprocess/mozprocess/wpk.py +++ b/testing/mozbase/mozprocess/mozprocess/wpk.py @@ -2,6 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. +from __future__ import absolute_import + from ctypes import sizeof, windll, addressof, create_unicode_buffer from ctypes.wintypes import DWORD, HANDLE