Use timeit.default_timer() instead of time.clock(), which is deprecated

Author: iMichka

pygccxml/declarations/scopedef.py

@@ -5,7 +5,7 @@
 
 """Defines :class:`scopedef_t` class"""
 
-import time
+import timeit
 import collections
 
 from . import algorithm
@@ -273,7 +273,7 @@ def init_optimizer(self):
         if self.name == '::':
             self._logger.debug(
                 "preparing data structures for query optimizer - started")
-        start_time = time.clock()
+        start_time = timeit.default_timer()
 
         self.clear_optimizer()
 
@@ -307,7 +307,7 @@ def init_optimizer(self):
         if self.name == '::':
             self._logger.debug((
                 "preparing data structures for query optimizer - " +
-                "done( %f seconds ). "), (time.clock() - start_time))
+                "done( %f seconds ). "), (timeit.default_timer() - start_time))
         self._optimized = True
 
     @staticmethod
@@ -454,7 +454,7 @@ def __findout_range(self, name, decl_type, recursive):
     def _find_single(self, match_class, **keywds):
         """implementation details"""
         self._logger.debug('find single query execution - started')
-        start_time = time.clock()
+        start_time = timeit.default_timer()
         norm_keywds = self.__normalize_args(**keywds)
         decl_matcher = self.__create_matcher(match_class, **norm_keywds)
         dtype = self.__findout_decl_type(match_class, **norm_keywds)
@@ -463,13 +463,13 @@ def _find_single(self, match_class, **keywds):
         found = matcher.get_single(decl_matcher, decls, False)
         self._logger.debug(
             'find single query execution - done( %f seconds )',
-            (time.clock() - start_time))
+            (timeit.default_timer() - start_time))
         return found
 
     def _find_multiple(self, match_class, **keywds):
         """implementation details"""
         self._logger.debug('find all query execution - started')
-        start_time = time.clock()
+        start_time = timeit.default_timer()
         norm_keywds = self.__normalize_args(**keywds)
         decl_matcher = self.__create_matcher(match_class, **norm_keywds)
         dtype = self.__findout_decl_type(match_class, **norm_keywds)
@@ -481,7 +481,7 @@ def _find_multiple(self, match_class, **keywds):
         self._logger.debug('%d declaration(s) that match query', len(mfound))
         self._logger.debug(
             'find single query execution - done( %f seconds )',
-            (time.clock() - start_time))
+            (timeit.default_timer() - start_time))
         if not mfound and not allow_empty:
             raise RuntimeError(
                 "Multi declaration query returned 0 declarations.")

pygccxml/parser/declarations_cache.py

@@ -4,7 +4,7 @@
 # See http://www.boost.org/LICENSE_1_0.txt
 
 import os
-import time
+import timeit
 import hashlib
 try:
     import cPickle as pickle
@@ -188,11 +188,11 @@ def __load(file_name):
         cache_file_obj = open(file_name, 'rb')
         try:
             file_cache_t.logger.info('Loading cache file "%s".', file_name)
-            start_time = time.clock()
+            start_time = timeit.default_timer()
             cache = pickle.load(cache_file_obj)
             file_cache_t.logger.debug(
                 "Cache file has been loaded in %.1f secs",
-                (time.clock() - start_time))
+                (timeit.default_timer() - start_time))
             file_cache_t.logger.debug(
                 "Found cache in file: [%s]  entries: %s",
                 file_name, len(list(cache.keys())))

pygccxml/parser/project_reader.py

@@ -4,7 +4,7 @@
 # See http://www.boost.org/LICENSE_1_0.txt
 
 import os
-import time
+import timeit
 
 import pygccxml.declarations
 
@@ -316,11 +316,11 @@ def __parse_file_by_file(self, files):
             namespaces.append(decls)
 
         self.logger.debug("Flushing cache... ")
-        start_time = time.clock()
+        start_time = timeit.default_timer()
         self.__dcache.flush()
         self.logger.debug(
             "Cache has been flushed in %.1f secs",
-            (time.clock() - start_time))
+            (timeit.default_timer() - start_time))
         answer = []
         self.logger.debug("Joining namespaces ...")
         for file_nss in namespaces:

unittests/misc/test_performance.py

@@ -5,7 +5,7 @@
 
 import os
 import sys
-import time
+import timeit
 import hotshot
 import hotshot.stats
 
@@ -27,25 +27,25 @@
 def test_on_windows_dot_h():
     he = r"2003\Vc7\PlatformSDK\Include\windows.h"
     windows_header = r"D:\Program Files\Microsoft Visual Studio .NET " + he
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.source_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_file(windows_header)
     dcache.flush()
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('without cache: %f seconds' % (clock_now - clock_prev))
 
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.source_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_file(windows_header)
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('with cache   : %f seconds' % (clock_now - clock_prev))
 
 #########################################################################
@@ -56,25 +56,25 @@ def test_source_on_include_std_dot_hpp():
     include_std_header = os.path.join(
         autoconfig.data_directory,
         'include_std.hpp')
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.source_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_file(include_std_header)
     dcache.flush()
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('without cache: %f seconds' % (clock_now - clock_prev))
 
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.source_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_file(include_std_header)
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('with cache   : %f seconds' % (clock_now - clock_prev))
 
 
@@ -84,25 +84,25 @@ def test_project_on_include_std_dot_hpp():
     include_std_header = os.path.join(
         autoconfig.data_directory,
         'include_std.hpp')
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.project_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_files([include_std_header])
     dcache.flush()
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('without cache: %f seconds' % (clock_now - clock_prev))
 
-    clock_prev = time.clock()
+    clock_prev = timeit.default_timer()
     dcache = parser.file_cache_t(dcache_file_name)
     reader = parser.project_reader_t(
         parser.xml_generator_configuration_t(
             xml_generator_path=autoconfig.generator_path),
         dcache)
     reader.read_files([include_std_header])
-    clock_now = time.clock()
+    clock_now = timeit.default_timer()
     print('with cache   : %f seconds' % (clock_now - clock_prev))