summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2012-12-13 14:04:15 +0000
committerGiampaolo Rodola' <g.rodola@gmail.com>2012-12-13 14:04:15 +0000
commit3fa7346e477cf0c537d2b82b96eac765246b3322 (patch)
tree0e19f381c158844da92f2ba3090b899e63e08f0b
parentf1c86ab5db6688e693608b4c2f2cc3750e1e2c80 (diff)
downloadpsutil-3fa7346e477cf0c537d2b82b96eac765246b3322.tar.gz
Revert r1548 (issue 340): ignoring files with handle.GrantedAccess == 0x00120089 translates into skipping *all* legitimate files.
-rw-r--r--HISTORY1
-rw-r--r--psutil/arch/mswindows/process_handles.c1
-rw-r--r--setup.py1
3 files changed, 1 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index ef91ea4a..93e8640a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -20,7 +20,6 @@ BUG FIXES
implementation will raise NotImplementedError rather than RuntimeError and
Process.as_dict() will not blow up. (patch by Curtin1060)
* Issue 339: (FreeBSD) get_pid_list() can allocate all the memory on system.
- * Issue 340: (Windows) Process.get_open_files() might hang forever.
* Issue 341: (Linux) psutil might crash on import due to error in retrieving
system terminals map.
* Issue 344: (FreeBSD) swap_memory() might return incorrect results due to
diff --git a/psutil/arch/mswindows/process_handles.c b/psutil/arch/mswindows/process_handles.c
index 47a565cb..1ee58a03 100644
--- a/psutil/arch/mswindows/process_handles.c
+++ b/psutil/arch/mswindows/process_handles.c
@@ -189,7 +189,6 @@ get_open_files(long pid, HANDLE processHandle)
if((handle.GrantedAccess == 0x0012019f)
|| (handle.GrantedAccess == 0x001a019f)
|| (handle.GrantedAccess == 0x00120189)
- || (handle.GrantedAccess == 0x00120089)
|| (handle.GrantedAccess == 0x00100000)) {
continue;
}
diff --git a/setup.py b/setup.py
index 7536b5ce..df886930 100644
--- a/setup.py
+++ b/setup.py
@@ -137,6 +137,7 @@ def main():
'Programming Language :: Python :: 3.0',
'Programming Language :: Python :: 3.1',
'Programming Language :: Python :: 3.2',
+ 'Programming Language :: Python :: 3.3',
'Topic :: System :: Monitoring',
'Topic :: System :: Networking',
'Topic :: System :: Networking :: Monitoring',