From 946e7b446dacf18051621d64e1b0bbd086902923 Mon Sep 17 00:00:00 2001
From: Malte Ried <mried@users.noreply.github.com>
Date: Fri, 2 Jan 2015 19:10:57 +0100
Subject: [PATCH] Take care of None objects when dealing with tasks

---
 beets/importer.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/beets/importer.py b/beets/importer.py
index ce407d701..59f35e810 100644
--- a/beets/importer.py
+++ b/beets/importer.py
@@ -978,7 +978,8 @@ class ImportTaskFactory(object):
                     tasks = self.singleton(path)
                     if tasks:
                         for task in tasks:
-                            yield task
+                            if task:
+                                yield task
                 for task in self.sentinel(dirs):
                     yield task
 
@@ -986,7 +987,8 @@ class ImportTaskFactory(object):
                 tasks = self.album(paths, dirs)
                 if tasks:
                     for task in tasks:
-                        yield task
+                        if task:
+                            yield task
 
     def paths(self):
         """Walk `self.toppath` and yield pairs of directory lists and
@@ -1151,7 +1153,8 @@ def query_tasks(session):
             tasks = task_factory.singleton(None, item)
             if tasks:
                 for task in tasks:
-                    yield task
+                    if task:
+                        yield task
 
     else:
         # Search for albums.
@@ -1169,7 +1172,8 @@ def query_tasks(session):
             tasks = task_factory.album(None, [album.item_dir()], items)
             if tasks:
                 for task in tasks:
-                    yield task
+                    if task:
+                        yield task
 
 
 @pipeline.mutator_stage
@@ -1219,7 +1223,8 @@ def user_query(session, task):
                 new_tasks = task_factory.singleton(None, item)
                 if new_tasks:
                     for t in new_tasks:
-                        yield t
+                        if t:
+                            yield t
             for t in task_factory.sentinel(task.paths):
                 yield t
 
@@ -1360,7 +1365,8 @@ def group_albums(session):
             new_tasks = task_factory.album(None, None, list(items))
             if new_tasks:
                 for t in new_tasks:
-                    tasks.append(t)
+                    if task:
+                        tasks.append(t)
         for t in task_factory.sentinel(task.paths):
             tasks.append(t)