From 510276f653e4dbbc1e05c2369b08632a88d21103 Mon Sep 17 00:00:00 2001
From: Peter <parkmeter@gmail.clom>
Date: Sun, 30 Jun 2019 13:44:13 +0200
Subject: [PATCH] fixing test

---
 beets/autotag/hooks.py | 15 +++++++++------
 beetsplug/discogs.py   |  7 +++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index 55ee033d4..fa4e0d73f 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -79,10 +79,12 @@ class AlbumInfo(object):
                  albumtype=None, va=False, year=None, month=None, day=None,
                  label=None, mediums=None, artist_sort=None,
                  releasegroup_id=None, catalognum=None, script=None,
-                 language=None, country=None, style=None, genre=None, albumstatus=None,
-                 media=None, albumdisambig=None, releasegroupdisambig=None,
-                 artist_credit=None, original_year=None, original_month=None,
-                 original_day=None, data_source=None, data_url=None, discogs_release_id=None, released_date=None):
+                 language=None, country=None, style=None, genre=None,
+                 albumstatus=None, media=None, albumdisambig=None,
+                 releasegroupdisambig=None, artist_credit=None,
+                 original_year=None, original_month=None,
+                 original_day=None, data_source=None, data_url=None,
+                 discogs_release_id=None, released_date=None):
         self.album = album
         self.album_id = album_id
         self.artist = artist
@@ -126,8 +128,9 @@ class AlbumInfo(object):
         """
         for fld in ['album', 'artist', 'albumtype', 'label', 'artist_sort',
                     'catalognum', 'script', 'language', 'country', 'style',
-                    'genre', 'albumstatus', 'albumdisambig', 'releasegroupdisambig',
-                    'artist_credit', 'media', 'discogs_release_id', 'released_date']:
+                    'genre', 'albumstatus', 'albumdisambig',
+                    'releasegroupdisambig', 'artist_credit',
+                    'media', 'discogs_release_id', 'released_date']:
             value = getattr(self, fld)
             if isinstance(value, bytes):
                 setattr(self, fld, value.decode(codec, 'ignore'))
diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
index 280bc659d..2469b85e5 100644
--- a/beetsplug/discogs.py
+++ b/beetsplug/discogs.py
@@ -349,7 +349,9 @@ class DiscogsPlugin(BeetsPlugin):
                          albumdisambig=None, artist_credit=None,
                          original_year=original_year, original_month=None,
                          original_day=None, data_source='Discogs',
-                         data_url=data_url, discogs_release_id=discogs_release_id, released_date=released_date)
+                         data_url=data_url,
+                         discogs_release_id=discogs_release_id,
+                         released_date=released_date)
 
     def format(self, classification):
         if classification is None:
@@ -358,7 +360,8 @@ class DiscogsPlugin(BeetsPlugin):
             return self.config['separator'].as_str().join(sorted(classification))
 
     def extract_release_id(self, uri):
-        return uri.split("/")[-1]
+        if uri:
+            return uri.split("/")[-1]
 
     def get_artist(self, artists):
         """Returns an artist string (all artists) and an artist_id (the main