[misc] Move `threaded`, `Expose` form Addon to misc

3 files changed, 21 insertions, 21 deletions

diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py
index cf7321893..8dee04811 100644
--- a/module/plugins/internal/Addon.py
+++ b/module/plugins/internal/Addon.py
@@ -6,26 +6,10 @@ from module.plugins.internal.Plugin import Plugin
 from module.plugins.internal.misc import Periodical, isiterable
 
 
-def threaded(fn):
-    def run(*args, **kwargs):
-        hookManager.startThread(fn, *args, **kwargs)
-
-    return run
-
-
-class Expose(object):
-    """
-    Used for decoration to declare rpc services
-    """
-    def __new__(cls, fn, *args, **kwargs):
-        hookManager.addRPC(fn.__module__, fn.func_name, fn.func_doc)
-        return fn
-
-
 class Addon(Plugin):
     __name__    = "Addon"
     __type__    = "hook"  #@TODO: Change to `addon` in 0.4.10
-    __version__ = "0.51"
+    __version__ = "0.52"
     __status__  = "stable"
 
     __threaded__ = []  #@TODO: Remove in 0.4.10
diff --git a/module/plugins/internal/Notifier.py b/module/plugins/internal/Notifier.py
index 8c79cf7fa..1809d7158 100644
--- a/module/plugins/internal/Notifier.py
+++ b/module/plugins/internal/Notifier.py
@@ -2,14 +2,14 @@
 
 import time
 
-from module.plugins.internal.Addon import Addon, Expose
-from module.plugins.internal.misc import encode, isiterable
+from module.plugins.internal.Addon import Addon
+from module.plugins.internal.misc import encode, Expose, isiterable
 
 
 class Notifier(Addon):
     __name__    = "Notifier"
     __type__    = "hook"
-    __version__ = "0.07"
+    __version__ = "0.09"
     __status__  = "testing"
 
     __config__ = [("activated"       , "bool", "Activated"                                , False),
diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py
index e62a7d6cd..6f3dd546e 100644
--- a/module/plugins/internal/misc.py
+++ b/module/plugins/internal/misc.py
@@ -38,7 +38,7 @@ except ImportError:
 class misc(object):
     __name__    = "misc"
     __type__    = "plugin"
-    __version__ = "0.25"
+    __version__ = "0.26"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -123,6 +123,15 @@ class DB(object):
         self.plugin.pyload.db.delStorage(self.plugin.classname, key)
 
 
+class Expose(object):
+    """
+    Used for decoration to declare rpc services
+    """
+    def __new__(cls, fn, *args, **kwargs):
+        hookManager.addRPC(fn.__module__, fn.func_name, fn.func_doc)
+        return fn
+
+
 class Periodical(object):
 
     def __init__(self, plugin, task=lambda x: x, interval=None):
@@ -231,6 +240,13 @@ def lock(fn):
     return new
 
 
+def threaded(fn):
+    def run(*args, **kwargs):
+        hookManager.startThread(fn, *args, **kwargs)
+
+    return run
+
+
 def format_time(value):
     dt   = datetime.datetime(1, 1, 1) + datetime.timedelta(seconds=abs(int(value)))
     days = ("%d days and " % (dt.day - 1)) if dt.day > 1 else ""