summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-16 22:14:09 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-16 22:14:09 +0200
commit2899b4ca814aea82f9190a8a40837dfda897d854 (patch)
tree11c4e34c61ea3fb19f025a3594314e841547a090
parentff8d4457dbc2df40604fd974b97df785abfbe967 (diff)
downloadpsutil-2899b4ca814aea82f9190a8a40837dfda897d854.tar.gz
fix win C warnings
-rw-r--r--psutil/_pswindows.py2
-rwxr-xr-xpsutil/tests/test_windows.py21
-rwxr-xr-xsetup.py1
3 files changed, 13 insertions, 11 deletions
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py
index bd6b091f..6d0679d6 100644
--- a/psutil/_pswindows.py
+++ b/psutil/_pswindows.py
@@ -181,7 +181,7 @@ pio = namedtuple('pio', ['read_count', 'write_count',
@lru_cache(maxsize=512)
def convert_dos_path(s):
- """Convert paths using native DOS format like:
+ r"""Convert paths using native DOS format like:
"\Device\HarddiskVolume1\Windows\systemew\file.txt"
into:
"C:\Windows\systemew\file.txt"
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index c1b080cf..e4a719ea 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -17,15 +17,7 @@ import signal
import subprocess
import sys
import time
-
-try:
- import win32api # requires "pip install pypiwin32" / "make setup-dev-env"
- import win32con
- import win32process
- import wmi # requires "pip install wmi" / "make setup-dev-env"
-except ImportError:
- if os.name == 'nt':
- raise
+import warnings
import psutil
from psutil import WINDOWS
@@ -40,6 +32,17 @@ from psutil.tests import run_test_module_by_name
from psutil.tests import sh
from psutil.tests import unittest
+with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ try:
+ import win32api # requires "pip install pypiwin32"
+ import win32con
+ import win32process
+ import wmi # requires "pip install wmi" / "make setup-dev-env"
+ except ImportError:
+ if os.name == 'nt':
+ raise
+
cext = psutil._psplatform.cext
diff --git a/setup.py b/setup.py
index 55d86b47..7c6ffc9e 100755
--- a/setup.py
+++ b/setup.py
@@ -133,7 +133,6 @@ if WINDOWS:
'psutil._psutil_windows',
sources=sources + [
'psutil/_psutil_windows.c',
- 'psutil/_psutil_common.c',
'psutil/arch/windows/process_info.c',
'psutil/arch/windows/process_handles.c',
'psutil/arch/windows/security.c',