Merge pull request #1 from ClericPy/dev

add methods attrs

Author: ClericPy

_test_py3_cases.py

@@ -20,5 +20,7 @@ async def task():
         assert result[2] - now > 1
         assert result[3] - now > 1
         assert result[4] - now > 2
+        assert frequency.to_dict() == {'n': 2, 'interval': 1}
+        assert frequency.to_list() == [2, 1]
 
     get_event_loop().run_until_complete(test_async())

frequency_controller/__init__.py

@@ -8,4 +8,4 @@
     # not support python2
     AsyncFrequency = None
 
-__version__ = '0.0.5'
+__version__ = '0.0.6'

frequency_controller/async_tools.py

@@ -4,10 +4,12 @@
 
 class Frequency(object):
     """Frequency controller, means concurrent running n tasks every interval seconds."""
-    __slots__ = ("gen", "__aenter__", "repr", "_lock")
+    __slots__ = ("gen", "__aenter__", "repr", "_lock", "n", "interval")
     TIMER = time
 
     def __init__(self, n=None, interval=0):
+        self.n = n
+        self.interval = interval
         if n:
             self.gen = self.generator(n, interval)
             self._lock = None
@@ -18,6 +20,12 @@ def __init__(self, n=None, interval=0):
             self.__aenter__ = self.__aexit__
             self.repr = "Frequency(unlimited)"
 
+    def to_list(self):
+        return [self.n, self.interval]
+
+    def to_dict(self):
+        return {'n': self.n, 'interval': self.interval}
+
     @property
     def lock(self):
         # lazy init loop

frequency_controller/sync_tools.py

@@ -4,10 +4,12 @@
 
 class Frequency(object):
     """Frequency controller, means concurrent running n tasks every interval seconds."""
-    __slots__ = ("gen", "repr", "lock", "__enter__")
+    __slots__ = ("gen", "repr", "lock", "__enter__", "n", "interval")
     TIMER = time
 
     def __init__(self, n=None, interval=0):
+        self.n = n
+        self.interval = interval
         self.repr = "Frequency({n}, {interval})".format(n=n, interval=interval)
         if n:
             self.lock = Lock()
@@ -18,6 +20,12 @@ def __init__(self, n=None, interval=0):
             self.gen = None
             self.__enter__ = self.__exit__
 
+    def to_list(self):
+        return [self.n, self.interval]
+
+    def to_dict(self):
+        return {'n': self.n, 'interval': self.interval}
+
     def generator(self, n=2, interval=1):
         q = [0] * n
         while 1:

setup.py

@@ -10,7 +10,8 @@
 linux:
 rm -rf "dist/*";rm -rf "build/*";python3 setup.py bdist_wheel;python2 setup.py bdist_wheel;twine upload "dist/*;rm -rf "dist/*";rm -rf "build/*""
 win32:
-rm -rf dist;rm -rf build;python3 setup.py bdist_wheel;python2 setup.py bdist_wheel;twine upload "dist/*";rm -rf dist;rm -rf build;rm -rf frequency_controller.egg-info
+rm -rf dist;rm -rf build;python3 setup.py bdist_wheel;python2 setup.py bdist_wheel;twine upload "dist/*"
+rm -rf dist;rm -rf build;rm -rf frequency_controller.egg-info
 """
 
 py_version = sys.version_info

test_cases.py

@@ -23,6 +23,8 @@ def test():
     assert result[2] - now > 1
     assert result[3] - now > 1
     assert result[4] - now > 2
+    assert frequency.to_dict() == {'n': 2, 'interval': 1}
+    assert frequency.to_list() == [2, 1]
 
 
 def test_async_frequency():
@@ -33,3 +35,4 @@ def test_async_frequency():
 
 if __name__ == "__main__":
     test_sync_frequency()
+    test_async_frequency()