fix Timer

docs/source/hal.hashes.rst

@@ -0,0 +1,20 @@
+hal.hashes package
+==================
+
+.. automodule:: hal.hashes
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+hal.hashes.md5 module
+---------------------
+
+.. automodule:: hal.hashes.md5
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+

docs/source/hal.profile.rst

@@ -17,6 +17,14 @@ hal.profile.mem module
     :undoc-members:
     :show-inheritance:
 
+hal.profile.models module
+-------------------------
+
+.. automodule:: hal.profile.models
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 hal.profile.performance module
 ------------------------------
 

docs/source/hal.rst

@@ -15,6 +15,7 @@ Subpackages
     hal.cvs
     hal.data
     hal.files
+    hal.hashes
     hal.internet
     hal.maths
     hal.meta
@@ -23,6 +24,7 @@ Subpackages
     hal.profile
     hal.streams
     hal.strings
+    hal.system
     hal.tests
     hal.times
     hal.wrappers

docs/source/hal.system.rst

@@ -0,0 +1,20 @@
+hal.system package
+==================
+
+.. automodule:: hal.system
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+hal.system.process module
+-------------------------
+
+.. automodule:: hal.system.process
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+

hal/__version__.py

@@ -2,7 +2,7 @@
 __description__ = 'Your swiss knife to perform fast and easy pythonic stuff'
 __url__ = 'https://sirfoga.github.io/pyhal/'
 __version__ = '10.2.6'
-__build__ = 'f431a5c25ca4b900e42b8407e48b6c3dfd04c382'
+__build__ = '3ab1a4ac77c2310fb7bf8964fa78dab018b43d72'
 __author__ = 'Stefano Fogarollo'
 __author_email__ = 'sirfoga@protonmail.com'
 __license__ = 'MIT'

hal/meta/attributes.py

@@ -203,3 +203,12 @@ def get_class_name(obj):
     :return: Name of class
     """
     return str(obj.__class__.__name__)
+
+
+def get_method_name(func):
+    """Finds name of method
+
+    :param func: method
+    :return: Name of method
+    """
+    return str(func.__name__)

hal/profile/models.py

@@ -9,7 +9,7 @@ class Timer(object):
     def __enter__(self):
         self.__start = time.time()
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, exception_type, exception_value, traceback):
         self.__finish = time.time()
 
     def elapsed_time(self):

hal/profile/performance.py

@@ -3,6 +3,7 @@
 """Perform benchmarks and tests on your PC """
 
 import getpass
+import os
 import random
 import sys
 
@@ -68,8 +69,9 @@ def run_test(self):
         """
         timer = Timer()
 
-        problem = EightQueen(self.size)
-        problem.solve(problem.board_size)
+        with timer:
+            problem = EightQueen(self.size)
+            problem.solve(problem.board_size)
 
         return timer.elapsed_time()
 
@@ -96,18 +98,19 @@ def run(self):
         """Runs test and safes results"""
         max_board_size = self.size
         timer = Timer()
+        with timer:
+            for size in range(max_board_size + 1):
+                timing = self.run_test()
+                self.update_std_out_and_log(
+                    "BOARD SIZE".ljust(10) +
+                    str(size).ljust(10) + "TIME REQUIRED (s)".ljust(20) +
+                    str('{:03.3f}'.format(timing))
+                )
 
-        for size in range(max_board_size + 1):
-            timing = self.run_test()
-            self.update_std_out_and_log(
-                "BOARD SIZE".ljust(10) +
-                str(size).ljust(10) + "TIME REQUIRED (s)".ljust(20) +
-                str('{:03.3f}'.format(timing))
-            )
-        length = timer.elapsed_time()
+        seconds = timer.elapsed_time()
 
         self.update_std_out_and_log(
-            "It took me " + str(length) + " seconds to complete all " + str(
+            "It took me " + str(seconds) + " seconds to complete all " + str(
                 max_board_size) + " problems.\nThanks for your patience!")
 
         if input("Do you wanna save the results? [y/n]").startswith("y"):

hal/wrappers/profile.py

@@ -4,6 +4,7 @@
 
 import functools
 
+from hal.meta.attributes import get_method_name
 from hal.profile.models import Timer
 from hal.streams.logger import log_message
 
@@ -26,11 +27,12 @@ def _execute(*args, **kwargs):
         :return: function result
         """
 
-        func_name = func.func_name
+        func_name = get_method_name(func)
         timer = Timer()
         log_message(func_name, "has started")
 
-        result = func(*args, **kwargs)
+        with timer:
+            result = func(*args, **kwargs)
 
         seconds = "{:.3f}".format(timer.elapsed_time())
         log_message(func_name, "has finished. Execution time:", seconds, "s")

tests/test_hal_maths_primes.py

@@ -30,9 +30,9 @@ def test_blum_blum_shub():
 
     assert len(randoms) == amount
 
-    distro = describe(randoms)
+    distribution = describe(randoms)
 
-    assert abs(distro.skewness) <= 0.5
+    assert abs(distribution.skewness) <= 0.5
 
     assert not blum_blum_shub(seed, 0, primes[0], primes[1])
 

tests/test_hal_meta_attributes.py

@@ -2,9 +2,10 @@
 
 
 """Tests hal.meta.attributes implementation"""
+
 import os
 
-from hal.meta.attributes import ModuleFile
+from hal.meta.attributes import ModuleFile, get_method_name, get_class_name
 from hal.meta.attributes import get_modules
 
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -32,6 +33,16 @@ def test_get_modules():
     assert meta_module not in modules
 
 
+def test_get_class_name():
+    """Tests hal.meta.attributes.get_class_name method"""
+    assert get_class_name(None) == "NoneType"
+
+
+def test_get_method_name():
+    """Tests hal.meta.attributes.get_method_name method"""
+    assert get_method_name(get_method_name) == "get_method_name"
+
+
 class TestModuleFile:
     """Tests ModuleFile class"""