Merge bf22da6 into c9a56f7

finesm/__init__.py

@@ -1,4 +1,7 @@
 import inspect
+import logging
+
+logger = logging.getLogger()
 
 
 class State(object):
@@ -17,17 +20,23 @@ def decorator(f):
             return f
         return decorator
 
-    @property
-    def on_enter(self):
-        return self._on_event(self.EVENT_ENTER)
-
-    @property
-    def on_update(self):
-        return self._on_event(self.EVENT_UPDATE)
-
-    @property
-    def on_exit(self):
-        return self._on_event(self.EVENT_EXIT)
+    def on_enter(self, *args):
+        if len(args) == 1 and callable(args[0]):
+            return self._on_event(self.EVENT_ENTER)(args[0])
+        else:
+            return self._on_event(self.EVENT_ENTER)
+
+    def on_update(self, *args):
+        if len(args) == 1 and callable(args[0]):
+            return self._on_event(self.EVENT_UPDATE)(args[0])
+        else:
+            return self._on_event(self.EVENT_UPDATE)
+
+    def on_exit(self, *args):
+        if len(args) == 1 and callable(args[0]):
+            return self._on_event(self.EVENT_EXIT)(args[0])
+        else:
+            return self._on_event(self.EVENT_EXIT)
 
     def on_message(self, message_name):
         def decorator(f):

requirements_dev.txt

@@ -1,3 +1,2 @@
-pypandoc==1.3.3
 twine==1.8.1
 -r requirements_test.txt

setup.py

@@ -1,30 +1,23 @@
 from setuptools import setup
-from codecs import open
-from os import path
 
-here = path.abspath(path.dirname(__file__))
-
-try:
-    import pypandoc
-    long_description = pypandoc.convert('README.md', 'rst')
-except(IOError, ImportError):
-    with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-        long_description = f.read()
+with open('README.md', 'r') as fh:
+    long_description = fh.read()
 
 setup(
     name='finesm',
 
-    version='0.0.1',
+    version='1.0.0',
 
     description='A fine state machine',
     long_description=long_description,
+    long_description_content_type="text/markdown",
 
     url='https://github.com/wesleyks/finesm',
 
     license='MIT',
 
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',

tests/test_state_machine.py

@@ -19,7 +19,7 @@ def waiting_start(self):
     def waiting_exit(self):
         self.foo = True
 
-    @running.on_enter
+    @running.on_enter()
     def running_enter(self):
         self.bar = True