Module: deluge Branch: master Commit: c9e4d286c38646df7143ad0c72f8b24339c2b5a1
Author: Pedro Algarvio <[email protected]> Date: Fri Dec 10 03:29:36 2010 +0000 Ported the FreeSpace plugin to the deluge.plugins namespace. --- .../{freespace => FreeSpace}/create_dev_link.sh | 0 deluge/plugins/FreeSpace/deluge/__init__.py | 3 +++ .../plugins/FreeSpace/deluge/plugins/__init__.py | 3 +++ .../deluge/plugins}/freespace/__init__.py | 0 .../deluge/plugins}/freespace/common.py | 3 ++- .../deluge/plugins}/freespace/core.py | 0 .../deluge/plugins}/freespace/data/config.glade | 0 .../deluge/plugins}/freespace/data/freespace.js | 0 .../deluge/plugins}/freespace/gtkui.py | 0 .../deluge/plugins}/freespace/webui.py | 0 deluge/plugins/{freespace => FreeSpace}/setup.py | 11 ++++++----- 11 files changed, 14 insertions(+), 6 deletions(-) diff --git a/deluge/plugins/freespace/create_dev_link.sh b/deluge/plugins/FreeSpace/create_dev_link.sh similarity index 100% rename from deluge/plugins/freespace/create_dev_link.sh rename to deluge/plugins/FreeSpace/create_dev_link.sh diff --git a/deluge/plugins/FreeSpace/deluge/__init__.py b/deluge/plugins/FreeSpace/deluge/__init__.py new file mode 100644 index 0000000..94033e8 --- /dev/null +++ b/deluge/plugins/FreeSpace/deluge/__init__.py @@ -0,0 +1,3 @@ +# this is a namespace package +import pkg_resources +pkg_resources.declare_namespace(__name__) diff --git a/deluge/plugins/FreeSpace/deluge/plugins/__init__.py b/deluge/plugins/FreeSpace/deluge/plugins/__init__.py new file mode 100644 index 0000000..94033e8 --- /dev/null +++ b/deluge/plugins/FreeSpace/deluge/plugins/__init__.py @@ -0,0 +1,3 @@ +# this is a namespace package +import pkg_resources +pkg_resources.declare_namespace(__name__) diff --git a/deluge/plugins/freespace/freespace/__init__.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/__init__.py similarity index 100% rename from deluge/plugins/freespace/freespace/__init__.py rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/__init__.py diff --git a/deluge/plugins/freespace/freespace/common.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/common.py similarity index 91% rename from deluge/plugins/freespace/freespace/common.py rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/common.py index ef27e0a..33820b8 100644 --- a/deluge/plugins/freespace/freespace/common.py +++ b/deluge/plugins/FreeSpace/deluge/plugins/freespace/common.py @@ -39,4 +39,5 @@ def get_resource(filename): import pkg_resources, os - return pkg_resources.resource_filename("freespace", os.path.join("data", filename)) + return pkg_resources.resource_filename("deluge.plugins.freespace", + os.path.join("data", filename)) diff --git a/deluge/plugins/freespace/freespace/core.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py similarity index 100% rename from deluge/plugins/freespace/freespace/core.py rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py diff --git a/deluge/plugins/freespace/freespace/data/config.glade b/deluge/plugins/FreeSpace/deluge/plugins/freespace/data/config.glade similarity index 100% rename from deluge/plugins/freespace/freespace/data/config.glade rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/data/config.glade diff --git a/deluge/plugins/freespace/freespace/data/freespace.js b/deluge/plugins/FreeSpace/deluge/plugins/freespace/data/freespace.js similarity index 100% rename from deluge/plugins/freespace/freespace/data/freespace.js rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/data/freespace.js diff --git a/deluge/plugins/freespace/freespace/gtkui.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py similarity index 100% rename from deluge/plugins/freespace/freespace/gtkui.py rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py diff --git a/deluge/plugins/freespace/freespace/webui.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py similarity index 100% rename from deluge/plugins/freespace/freespace/webui.py rename to deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py diff --git a/deluge/plugins/freespace/setup.py b/deluge/plugins/FreeSpace/setup.py similarity index 89% rename from deluge/plugins/freespace/setup.py rename to deluge/plugins/FreeSpace/setup.py index 3c0dce6..03c732c 100755 --- a/deluge/plugins/freespace/setup.py +++ b/deluge/plugins/FreeSpace/setup.py @@ -37,7 +37,7 @@ # statement from all source files in the program, then also delete it here. # -from setuptools import setup +from setuptools import setup, find_packages __plugin_name__ = "FreeSpace" __author__ = "Pedro Algarvio" @@ -47,7 +47,7 @@ __url__ = "http://deluge.ufsoft.org/hg/Notification/"; __license__ = "GPLv3" __description__ = "Plugin which continuously checks for available free space." __long_description__ = __description__ -__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]} +__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]} setup( name=__plugin_name__, @@ -59,13 +59,14 @@ setup( license=__license__, long_description=__long_description__ if __long_description__ else __description__, - packages=[__plugin_name__.lower()], + packages=find_packages(), + namespace_packages = ["deluge", "deluge.plugins"], package_data = __pkg_data__, entry_points=""" [deluge.plugin.core] - %s = %s:CorePlugin + %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] - %s = %s:GtkUIPlugin + %s = deluge.plugins.%s:GtkUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*2) ) -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
