merge flexattr branch

This is a big change. Some things will probably break.

Author: sampsyo

beets/__init__.py

@@ -12,7 +12,7 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
-__version__ = '1.2.2'
+__version__ = '1.3.0'
 __author__ = 'Adrian Sampson <[email protected]>'
 
 import beets.library

beets/importer.py

@@ -810,7 +810,7 @@ def plugin_stage(session, func):
 
         # Stage may modify DB, so re-load cached item data.
         for item in task.imported_items():
-            session.lib.load(item)
+            item.load()
 
 def manipulate_files(session):
     """A coroutine (pipeline stage) that performs necessary file
@@ -866,7 +866,7 @@ def manipulate_files(session):
         # Save new paths.
         with session.lib.transaction():
             for item in items:
-                session.lib.store(item)
+                item.store()
 
         # Plugin event.
         plugins.send('import_task_files', session=session, task=task)