[kupfer] plugin.virtualbox: Make a packge out of this plugin

[Ulrik Sverdrup <usverdrup src gnome org>]

commit c7e6ff8877c3f31b16731f02b1dd6cf895dd64ea
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Oct 27 19:49:19 2009 +0100

    plugin.virtualbox: Make a packge out of this plugin
    
    Kupfer should support plugins as either python modules or python
    packages. With PLUGIN/__init__.py replacing the previous PLUGIN.py,
    the change should be easy and understandable.
    
    __init__.py takes the role as the main plugin definition, but the
    plugin is then free to use as many modules it wishes inside its
    package.
    
    Python `PEP 328`__ strongly recommends using absolute imports, of the
    form::
    
        from kupfer.plugin.virtualbox import vboxapi_support
    
    where the module's path is specified in full. This is a good
    recommendation, while the relative style to import from the current
    package is tolerated::
    
        from . import vboxapi_support
    
    Using plain ``import vboxapi_support`` is deprecated and not
    recommended.
    
    __ http://www.python.org/dev/peps/pep-0328/
    
    This change was tested by Karol BÄ?dkowski <karol bedkowski gmail com>,
    who also contributed a bug fix.

 .../{virtualbox.py => virtualbox/__init__.py}      |    6 +++---
 .../constants.py}                                  |    0
 .../ose_support.py}                                |    3 ++-
 .../vboxapi_support.py}                            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/kupfer/plugin/virtualbox.py b/kupfer/plugin/virtualbox/__init__.py
similarity index 93%
rename from kupfer/plugin/virtualbox.py
rename to kupfer/plugin/virtualbox/__init__.py
index 32701e6..56e7e61 100644
--- a/kupfer/plugin/virtualbox.py
+++ b/kupfer/plugin/virtualbox/__init__.py
@@ -15,13 +15,13 @@ __kupfer_settings__ = plugin_support.PluginSettings(
 )
 
 try:
-	import virtualbox_vboxapi_support as vbox_support
+	from kupfer.plugin.virtualbox import vboxapi_support as vbox_support
 	pretty.print_info(__name__, 'Using vboxapi...')
 except ImportError, err:
-	import virtualbox_ose_support as vbox_support
+	from kupfer.plugin.virtualbox import ose_support as vbox_support
 	pretty.print_info(__name__, 'Using cli...', err)
 
-import virtualbox_const_support as vbox_const
+from kupfer.plugin.virtualbox import constants as vbox_const
 
 
 class VirtualMachine(Leaf):
diff --git a/kupfer/plugin/virtualbox_const_support.py b/kupfer/plugin/virtualbox/constants.py
similarity index 100%
rename from kupfer/plugin/virtualbox_const_support.py
rename to kupfer/plugin/virtualbox/constants.py
diff --git a/kupfer/plugin/virtualbox_ose_support.py b/kupfer/plugin/virtualbox/ose_support.py
similarity index 98%
rename from kupfer/plugin/virtualbox_ose_support.py
rename to kupfer/plugin/virtualbox/ose_support.py
index 2e1ca44..9cc0687 100644
--- a/kupfer/plugin/virtualbox_ose_support.py
+++ b/kupfer/plugin/virtualbox/ose_support.py
@@ -12,8 +12,9 @@ __version__ = '0.3'
 
 import os
 from xml.dom import minidom
+
 from kupfer import pretty, utils
-import virtualbox_const_support as vbox_const
+from kupfer.plugin.virtualbox import constants as vbox_const
 
 _VBOX_CONFIG_DIR = os.path.expanduser('~/.VirtualBox/')
 _VBOX_CONFIG_FILE = os.path.join(_VBOX_CONFIG_DIR, 'VirtualBox.xml')
diff --git a/kupfer/plugin/virtualbox_vboxapi_support.py b/kupfer/plugin/virtualbox/vboxapi_support.py
similarity index 98%
rename from kupfer/plugin/virtualbox_vboxapi_support.py
rename to kupfer/plugin/virtualbox/vboxapi_support.py
index c5b6625..843db1c 100644
--- a/kupfer/plugin/virtualbox_vboxapi_support.py
+++ b/kupfer/plugin/virtualbox/vboxapi_support.py
@@ -14,7 +14,7 @@ from kupfer import pretty
 
 import vboxapi
 
-import virtualbox_const_support as vbox_const
+from kupfer.plugin.virtualbox import constants as vbox_const
 
 MONITORED_DIRS = None
 IS_DYNAMIC = False