From: Daira Hopwood Date: Tue, 27 Oct 2015 12:02:57 +0000 (+0000) Subject: Consolidate Windows-specific imports in fileutil to avoid pyflakes warnings. X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=92301cb731dd0347d704e84c73a26547767d7469;p=tahoe-lafs%2Ftahoe-lafs.git Consolidate Windows-specific imports in fileutil to avoid pyflakes warnings. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index a2be63c0..7171bb45 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -6,6 +6,11 @@ import sys, exceptions, os, stat, tempfile, time, binascii from collections import namedtuple from errno import ENOENT +if sys.platform == "win32": + from ctypes import WINFUNCTYPE, windll, POINTER, byref, c_ulonglong, create_unicode_buffer + from ctypes.wintypes import BOOL, HANDLE, DWORD, LPCWSTR, LPWSTR, LPVOID, WinError, get_last_error + + from twisted.python import log from pycryptopp.cipher.aes import AES @@ -338,10 +343,6 @@ def to_windows_long_path(path): have_GetDiskFreeSpaceExW = False if sys.platform == "win32": - from ctypes import WINFUNCTYPE, windll, POINTER, byref, c_ulonglong, create_unicode_buffer, \ - get_last_error - from ctypes.wintypes import BOOL, DWORD, LPCWSTR, LPWSTR - # GetEnvironmentVariableW = WINFUNCTYPE( DWORD, @@ -521,8 +522,6 @@ def get_available_space(whichdir, reserved_space): if sys.platform == "win32": - from ctypes.wintypes import BOOL, HANDLE, DWORD, LPCWSTR, LPVOID, WinError, get_last_error - # CreateFileW = WINFUNCTYPE(HANDLE, LPCWSTR, DWORD, DWORD, LPVOID, DWORD, DWORD, HANDLE) \ (("CreateFileW", windll.kernel32)) @@ -576,9 +575,6 @@ def reraise(wrapper): raise wrapper_exc.__class__, wrapper_exc, tb if sys.platform == "win32": - from ctypes import WINFUNCTYPE, windll, WinError, get_last_error - from ctypes.wintypes import BOOL, DWORD, LPCWSTR, LPVOID - # ReplaceFileW = WINFUNCTYPE( BOOL,