Commits

Floris Bruynooghe  committed 363dd93

Refresh patch

  • Participants
  • Parent commits a3d969b

Comments (0)

Files changed (1)

  
  
  class BuildExtCommand(build_ext):
-@@ -350,6 +361,7 @@ class BuildExtCommand(build_ext):
+@@ -349,6 +360,7 @@ class BuildExtCommand(build_ext):
                     '/wd4100', # unused argument
                     '/wd4054', # cast from function to data pointer
                     '/wd4127', # condition expression is const (Py_CLEAR())
  
  #ifndef WIN32
  #include <unistd.h>
-@@ -349,6 +350,21 @@ psi_strings_count(const char *cmdl, cons
+@@ -344,6 +345,21 @@ psi_strings_count(const char *cmdl, cons
  }
  
  
  char **
  psi_strings_to_array(char *buf, const int count)
  {
-@@ -378,6 +394,39 @@ psi_strings_to_array(char *buf, const in
+@@ -373,6 +389,39 @@ psi_strings_to_array(char *buf, const in
  }
  
  
  #define EPOCH_DIFF 0x019DB1DED53E8000LL /* 116444736000000000 nsecs */
  #define RATE_DIFF 10000000              /* 100 nsecs */
  
-@@ -386,15 +435,25 @@ psi_filetime2timespec(const FILETIME *ft
+@@ -381,15 +430,25 @@ psi_filetime2timespec(const FILETIME *ft
  {
      struct timespec tv;
      ULARGE_INTEGER ftime;
  import psi
  import psi.arch
  import psi.process
-@@ -234,7 +236,7 @@ class ProcessExeArgsEnvTest(unittest.Tes
+@@ -242,7 +244,7 @@ class ProcessExeArgsEnvTest(unittest.Tes
      def test_env_simple(self):
          self.assertEqual(self.p.env['HOME'], os.path.expanduser('~'))
  
          ARGVAPP = os.path.join(os.path.dirname(__file__), 'linux_argvapp')
          def test_argvapp_argc(self):
              self.app = TestApp([self.ARGVAPP])
-@@ -401,7 +403,7 @@ class ProcessAttrsTest(unittest.TestCase
+@@ -409,7 +411,7 @@ class ProcessAttrsTest(unittest.TestCase
  
  
  class ProcessPriorityTest(unittest.TestCase):
          def test_range(self):
              p = psi.process.Process(os.getpid())
              self.assertTrue(0 <= p.priority <= 255)
-@@ -535,7 +537,7 @@ class ProcessPrivsTest(unittest.TestCase
-         self.assertEqual(p.euid, 0)
+@@ -557,7 +559,7 @@ class ProcessPrivsTest(unittest.TestCase
+         self.assert_(self.p.command)
  
  
 -if os.geteuid() == 0 and (APP32 or APP64):