(Partial) Fix giampaolo#694

alxchk · May 19, 2017 · cc0caa4 · cc0caa4
1 parent d2b3066
commit cc0caa4
Show file tree

Hide file tree

Showing 2 changed files with 317 additions and 7 deletions.
diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py
@@ -370,18 +370,26 @@ def __init__(self, pid):
 
     def oneshot_enter(self):
         self._proc_name_and_args.cache_activate()
+        self._proc_environ.cache_activate()
         self._proc_basic_info.cache_activate()
         self._proc_cred.cache_activate()
 
     def oneshot_exit(self):
         self._proc_name_and_args.cache_deactivate()
+        self._proc_environ.cache_deactivate()
         self._proc_basic_info.cache_deactivate()
         self._proc_cred.cache_deactivate()
 
     @memoize_when_activated
     def _proc_name_and_args(self):
         return cext.proc_name_and_args(self.pid, self._procfs_path)
 
+    @memoize_when_activated
+    def _proc_environ(self):
+        args = cext.proc_environ(self.pid, self._procfs_path)
+        if args:
+            return dict(args)
+
     @memoize_when_activated
     def _proc_basic_info(self):
         ret = cext.proc_basic_info(self.pid, self._procfs_path)
@@ -414,6 +422,10 @@ def exe(self):
     def cmdline(self):
         return self._proc_name_and_args()[1].split(' ')
 
+    @wrap_exceptions
+    def environ(self):
+        return self._proc_environ()
+
     @wrap_exceptions
     def create_time(self):
         return self._proc_basic_info()[proc_info_map['create_time']]