Merge pull request #12 from JoeLametta/musicbrainz-update

Remove old musicbrainz dependency
whipper-team · Dec 12, 2015 · 89f3ba3 · 89f3ba3
2 parents cd1505c + 2a3d2bb
commit 89f3ba3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
@@ -267,7 +267,7 @@ def musicbrainz(discid, country=None, record=False):
     @rtype: list of L{DiscMetadata}
     """
     log.debug('musicbrainz', 'looking up results for discid %r', discid)
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainzngs
 
     ret = []
 

diff --git a/morituri/common/program.py b/morituri/common/program.py
@@ -33,7 +33,7 @@
 from morituri.image import image
 
 from morituri.extern.task import task, gstreamer
-from morituri.extern.musicbrainzngs import musicbrainz
+import musicbrainzngs
 
 
 # FIXME: should Program have a runner ?

diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
@@ -34,25 +34,14 @@ task_PYTHON = \
 	task/taskgtk.py \
 	task/gstreamer.py
 
-musicbrainzngsdir = $(PYTHONLIBDIR)/morituri/extern/musicbrainzngs
-
-musicbrainzngs_PYTHON = \
-	musicbrainzngs/__init__.py \
-	musicbrainzngs/musicbrainz.py \
-	musicbrainzngs/mbxml.py
-
-
 EXTRA_DIST = python-command/scripts/help2man
 
 log:
 	make git-submodule
-musicbrainzngs:
-	make git-submodule
 
 git-submodule:
 	cd $(top_srcdir) && git submodule init && git submodule sync && git submodule update
 
 .PHONY: git-submodule
 
 
-all-local: log musicbrainzngs
diff --git a/morituri/extern/musicbrainzngs b/morituri/extern/musicbrainzngs
diff --git a/morituri/extern/python-musicbrainz-ngs b/morituri/extern/python-musicbrainz-ngs
diff --git a/morituri/rip/main.py b/morituri/rip/main.py
@@ -35,7 +35,7 @@ def main(argv):
     h.validate()
 
     # set user agent
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainzngs
     musicbrainz.set_useragent("morituri", configure.version,
         'https://thomas.apestaart.org/morituri/trac')