Module: deluge Branch: master Commit: 16f617d240df2fbedf80121f25b7b293286e6409
Author: Pedro Algarvio <[email protected]> Date: Thu Dec 9 22:05:34 2010 +0000 Initial commit to implement the "deluge.plugins" namespace package support. --- deluge/__init__.py | 7 +++++++ deluge/plugins/AutoAdd/deluge/__init__.py | 7 +++++++ deluge/plugins/AutoAdd/deluge/plugins/__init__.py | 7 +++++++ .../deluge/plugins}/autoadd/__init__.py | 0 .../deluge/plugins}/autoadd/common.py | 3 ++- .../deluge/plugins}/autoadd/core.py | 0 .../deluge/plugins}/autoadd/data/autoadd.js | 0 .../plugins}/autoadd/data/autoadd_options.glade | 0 .../deluge/plugins}/autoadd/data/config.glade | 0 .../deluge/plugins}/autoadd/gtkui.py | 0 .../deluge/plugins}/autoadd/webui.py | 0 deluge/plugins/{autoadd => AutoAdd}/setup.py | 14 +++++++------- deluge/plugins/__init__.py | 8 ++++++++ setup.py | 1 + 14 files changed, 39 insertions(+), 8 deletions(-) diff --git a/deluge/__init__.py b/deluge/__init__.py index 1836ded..bb62714 100644 --- a/deluge/__init__.py +++ b/deluge/__init__.py @@ -1 +1,8 @@ """Deluge""" +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/deluge/plugins/AutoAdd/deluge/__init__.py b/deluge/plugins/AutoAdd/deluge/__init__.py new file mode 100644 index 0000000..2e2033b --- /dev/null +++ b/deluge/plugins/AutoAdd/deluge/__init__.py @@ -0,0 +1,7 @@ +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/deluge/plugins/AutoAdd/deluge/plugins/__init__.py b/deluge/plugins/AutoAdd/deluge/plugins/__init__.py new file mode 100644 index 0000000..2e2033b --- /dev/null +++ b/deluge/plugins/AutoAdd/deluge/plugins/__init__.py @@ -0,0 +1,7 @@ +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/deluge/plugins/autoadd/autoadd/__init__.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/__init__.py similarity index 100% rename from deluge/plugins/autoadd/autoadd/__init__.py rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/__init__.py diff --git a/deluge/plugins/autoadd/autoadd/common.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/common.py similarity index 92% rename from deluge/plugins/autoadd/autoadd/common.py rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/common.py index 16172a9..cc1b6a0 100644 --- a/deluge/plugins/autoadd/autoadd/common.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/common.py @@ -39,4 +39,5 @@ def get_resource(filename): import pkg_resources, os - return pkg_resources.resource_filename("autoadd", os.path.join("data", filename)) + return pkg_resources.resource_filename("deluge.plugins.autoadd", + os.path.join("data", filename)) diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py similarity index 100% rename from deluge/plugins/autoadd/autoadd/core.py rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd.js b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd.js similarity index 100% rename from deluge/plugins/autoadd/autoadd/data/autoadd.js rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd.js diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade similarity index 100% rename from deluge/plugins/autoadd/autoadd/data/autoadd_options.glade rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade diff --git a/deluge/plugins/autoadd/autoadd/data/config.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.glade similarity index 100% rename from deluge/plugins/autoadd/autoadd/data/config.glade rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.glade diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py similarity index 100% rename from deluge/plugins/autoadd/autoadd/gtkui.py rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py diff --git a/deluge/plugins/autoadd/autoadd/webui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py similarity index 100% rename from deluge/plugins/autoadd/autoadd/webui.py rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py diff --git a/deluge/plugins/autoadd/setup.py b/deluge/plugins/AutoAdd/setup.py similarity index 87% rename from deluge/plugins/autoadd/setup.py rename to deluge/plugins/AutoAdd/setup.py index 11c0e11..7763a92 100644 --- a/deluge/plugins/autoadd/setup.py +++ b/deluge/plugins/AutoAdd/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__ = "AutoAdd" __author__ = "Chase Sterling" @@ -47,7 +47,7 @@ __url__ = "http://forum.deluge-torrent.org/viewtopic.php?f=9&t=26775"; __license__ = "GPLv3" __description__ = "Monitors folders for .torrent files." __long_description__ = """""" -__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]} +__pkg_data__ = {'deluge.plugins.'+__plugin_name__.lower(): ["template/*", "data/*"]} setup( name=__plugin_name__, @@ -58,16 +58,16 @@ setup( url=__url__, 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 [deluge.plugin.webui] - %s = %s:WebUIPlugin + %s = deluge.plugins.%s:WebUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*3) ) diff --git a/deluge/plugins/__init__.py b/deluge/plugins/__init__.py index e69de29..bf99a9d 100644 --- a/deluge/plugins/__init__.py +++ b/deluge/plugins/__init__.py @@ -0,0 +1,8 @@ +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) + diff --git a/setup.py b/setup.py index 6f9c60a..c9b5234 100644 --- a/setup.py +++ b/setup.py @@ -485,5 +485,6 @@ setup( "ui/web/themes/images/*/*/*.png" ]}, packages = find_packages(exclude=["plugins", "docs", "tests"]), + namespace_packages = ["deluge", "deluge.plugins"], entry_points = entry_points ) -- 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.
