Merge branch 'master' of github.com:sampsyo/beets

This commit is contained in:
Adrian Sampson 2015-02-07 12:52:20 -08:00
commit 66b7e4cd39
2 changed files with 4 additions and 3 deletions

View file

@ -1060,8 +1060,9 @@ def parse_query_parts(parts, model_cls):
# Add path queries to aggregate query.
# Match field / flexattr depending on whether the model has the path field
fast_query = 'path' in model_cls._fields
query.subqueries += [PathQuery('path', s, fast_query) for s in path_parts]
fast_path_query = 'path' in model_cls._fields
query.subqueries += [PathQuery('path', s, fast_path_query)
for s in path_parts]
return query, sort

View file

@ -63,7 +63,7 @@ def _write_m3u(m3u_path, items_paths):
mkdirall(m3u_path)
with open(syspath(m3u_path), 'a') as f:
for path in items_paths:
f.write(path + '\n')
f.write(path + b'\n')
class ImportFeedsPlugin(BeetsPlugin):