Remove thomasvs' python-deps (#31)

* Crude removal of thomasvs' python-deps
* Fix previous commit

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "morituri/extern/flog"]
 	path = morituri/extern/flog
 	url = git://github.com/Flumotion/flog
-[submodule "morituri/extern/python-deps"]
-	path = morituri/extern/python-deps
-	url = git://github.com/thomasvs/python-deps

bin/rip.in

@@ -33,10 +33,6 @@ and assure it doesn't raise an exception.
 h = None
 
 try:
-    from morituri.common import deps
-    from morituri.extern.deps import deps as edeps
-    h = deps.DepsHandler()
-    h.validate()
     from morituri.rip import main
     sys.exit(main.main(sys.argv[1:]))
 except ImportError, e:
@@ -45,6 +41,3 @@ except ImportError, e:
         raise
     h.handleImportError(e)
     sys.exit(1)
-except edeps.DependencyError:
-    sys.stderr.write('rip: please fix the dependency and try again.\n')
-    sys.exit(1)

morituri/common/Makefile.am

@@ -9,7 +9,6 @@ morituri_PYTHON = \
 	cache.py \
 	common.py \
 	config.py \
-	deps.py \
 	directory.py \
 	drive.py \
 	encode.py \

morituri/common/deps.py

@@ -1,75 +0,0 @@
-# -*- Mode: Python -*-
-# vi:si:et:sw=4:sts=4:ts=4
-
-import os
-import urllib
-
-from morituri.extern.deps import deps
-
-
-class DepsHandler(deps.DepsHandler):
-
-    def __init__(self, name='morituri'):
-        deps.DepsHandler.__init__(self, name)
-
-        self.add(GStPython())
-        self.add(CDDB())
-        self.add(SetupTools())
-        self.add(PyCDIO())
-
-    def report(self, summary):
-        reporter = os.environ.get('EMAIL_ADDRESS', None)
-        get = "summary=%s" % urllib.quote(summary)
-        if reporter:
-            get += "&reporter=%s" % urllib.quote(reporter)
-        return 'http://thomas.apestaart.org/morituri/trac/newticket?' + get
-
-
-class GStPython(deps.Dependency):
-    module = 'gst'
-    name = "GStreamer Python bindings"
-    homepage = "http://gstreamer.freedesktop.org"
-
-    def Fedora_install(self, distro):
-        return self.Fedora_yum('gstreamer-python')
-
-    #def Ubuntu_install(self, distro):
-    #    pass
-
-
-class CDDB(deps.Dependency):
-    module = 'CDDB'
-    name = "python-CDDB"
-    homepage = "http://cddb-py.sourceforge.net/"
-
-    def Fedora_install(self, distro):
-        return self.Fedora_yum('python-CDDB')
-
-    def Ubuntu_install(self, distro):
-        return self.Ubuntu_apt('python-cddb')
-
-
-class SetupTools(deps.Dependency):
-    module = 'pkg_resources'
-    name = "python-setuptools"
-    homepage = "http://pypi.python.org/pypi/setuptools"
-
-    def Fedora_install(self, distro):
-        return self.Fedora_yum('python-setuptools')
-
-
-class PyCDIO(deps.Dependency):
-
-    module = 'pycdio'
-    name = "pycdio"
-    homepage = "http://www.gnu.org/software/libcdio/"
-    egg = 'pycdio'
-
-    def Fedora_install(self, distro):
-        return self.Fedora_yum('pycdio')
-
-    def validate(self):
-        version = self.version()
-        if version == '0.18':
-            return '''pycdio 0.18 does not work.
-See http://savannah.gnu.org/bugs/?38185'''

morituri/extern/Makefile.am

@@ -18,14 +18,6 @@ command_PYTHON = \
 	command/__init__.py \
 	command/command.py
 
-depsdir = $(PYTHONLIBDIR)/morituri/extern/deps
-
-deps_PYTHON = \
-	deps/__init__.py \
-	deps/deps.py \
-	deps/distro.py
-
-
 taskdir = $(PYTHONLIBDIR)/morituri/extern/task
 
 task_PYTHON = \

morituri/extern/deps

@@ -1 +0,0 @@
-python-deps/deps

morituri/rip/main.py

@@ -29,11 +29,6 @@ def main(argv):
     log.debug('mapping distributions %r', distributions)
     map(pkg_resources.working_set.add, distributions)
 
-    # validate dependencies
-    from morituri.common import deps
-    h = deps.DepsHandler()
-    h.validate()
-
     # set user agent
     import musicbrainzngs
     musicbrainzngs.set_useragent("morituri", configure.version,