From 767aa0868552728c8d731b3ac60978cd8c162bcb Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 1 Jan 2015 12:45:20 +0100
Subject: [PATCH 1/5] New year

(cherry picked from commit edcad494dabf4dc9ba3b86d2e50ac538ac60a0dd)
---
 docs/authors.rst | 2 +-
 docs/conf.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/authors.rst b/docs/authors.rst
index 7c00e2ac..1a0f21ed 100644
--- a/docs/authors.rst
+++ b/docs/authors.rst
@@ -4,7 +4,7 @@
 Authors
 *******
 
-Mopidy is copyright 2009-2014 Stein Magnus Jodal and contributors. Mopidy is
+Mopidy is copyright 2009-2015 Stein Magnus Jodal and contributors. Mopidy is
 licensed under the `Apache License, Version 2.0
 <http://www.apache.org/licenses/LICENSE-2.0>`_.
 
diff --git a/docs/conf.py b/docs/conf.py
index f7475293..f9cdd613 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -96,7 +96,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 project = 'Mopidy'
-copyright = '2009-2014, Stein Magnus Jodal and contributors'
+copyright = '2009-2015, Stein Magnus Jodal and contributors'
 
 from mopidy.utils.versioning import get_version
 release = get_version()

From 3a28aa299987feab5c501e0824ee8632eaceb633 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 1 Jan 2015 12:47:37 +0100
Subject: [PATCH 2/5] docs: Docs site has HTTPS now

(cherry picked from commit 78b39390e31d1e677fc630c8afea175991a2c1bc)
---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index a70eef7e..1da79a6e 100644
--- a/README.rst
+++ b/README.rst
@@ -49,8 +49,8 @@ Spotify.
 To get started with Mopidy, check out
 `the installation docs <http://docs.mopidy.com/en/latest/installation/>`_.
 
-- `Documentation <http://docs.mopidy.com/>`_
-- `Discuss <https://discuss.mopidy.com/>`_
+- `Documentation <https://docs.mopidy.com/>`_
+- `Discussion forum <https://discuss.mopidy.com/>`_
 - `Source code <https://github.com/mopidy/mopidy>`_
 - `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
 - `Development branch tarball <https://github.com/mopidy/mopidy/archive/develop.tar.gz#egg=mopidy-dev>`_

From fe8a9f8c39b3057bab265c2b9f4319c56e9c849b Mon Sep 17 00:00:00 2001
From: kingosticks <kingosticks@gmail.com>
Date: Sun, 4 Jan 2015 20:21:10 +0000
Subject: [PATCH 3/5] Add non-ascii utf-8 chars to test playlists

(cherry picked from commit 1e7a4247c69923c31a92d2ab6c0d0ffc8cd8970b)
---
 tests/audio/test_playlists.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/audio/test_playlists.py b/tests/audio/test_playlists.py
index 51c36eac..f8120941 100644
--- a/tests/audio/test_playlists.py
+++ b/tests/audio/test_playlists.py
@@ -13,7 +13,7 @@ BAD = b'foobarbaz'
 M3U = b"""#EXTM3U
 #EXTINF:123, Sample artist - Sample title
 file:///tmp/foo
-#EXTINF:321,Example Artist - Example title
+#EXTINF:321,Example Artist - Example \xc5\xa7\xc5\x95
 file:///tmp/bar
 #EXTINF:213,Some Artist - Other title
 file:///tmp/baz
@@ -25,7 +25,7 @@ File1=file:///tmp/foo
 Title1=Sample Title
 Length1=123
 File2=file:///tmp/bar
-Title2=Example title
+Title2=Example \xc5\xa7\xc5\x95
 Length2=321
 File3=file:///tmp/baz
 Title3=Other title
@@ -40,7 +40,7 @@ ASX = b"""<ASX version="3.0">
     <REF href="file:///tmp/foo" />
   </ENTRY>
   <ENTRY>
-    <TITLE>Example title</TITLE>
+    <TITLE>Example \xc5\xa7\xc5\x95</TITLE>
     <REF href="file:///tmp/bar" />
   </ENTRY>
   <ENTRY>
@@ -65,7 +65,7 @@ XSPF = b"""<?xml version="1.0" encoding="UTF-8"?>
       <location>file:///tmp/foo</location>
     </track>
     <track>
-      <title>Example title</title>
+      <title>Example \xc5\xa7\xc5\x95</title>
       <location>file:///tmp/bar</location>
     </track>
     <track>

From 7556af83b7216390df77b2a8a6705c4651ea4046 Mon Sep 17 00:00:00 2001
From: kingosticks <kingosticks@gmail.com>
Date: Sun, 4 Jan 2015 20:26:45 +0000
Subject: [PATCH 4/5] Use bytestrings when parsing M3U playlists Fixes #853

(cherry picked from commit d666083c6fe8fe17a5880b6e8e55890cf51992c4)
---
 mopidy/audio/playlists.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mopidy/audio/playlists.py b/mopidy/audio/playlists.py
index 35e0800d..ec5fd63a 100644
--- a/mopidy/audio/playlists.py
+++ b/mopidy/audio/playlists.py
@@ -57,11 +57,11 @@ def parse_m3u(data):
     # TODO: convert non URIs to file URIs.
     found_header = False
     for line in data.readlines():
-        if found_header or line.startswith('#EXTM3U'):
+        if found_header or line.startswith(b'#EXTM3U'):
             found_header = True
         else:
             continue
-        if not line.startswith('#') and line.strip():
+        if not line.startswith(b'#') and line.strip():
             yield line.strip()
 
 

From 73fac53dd59cba0d2344a498c4b45f6c76140653 Mon Sep 17 00:00:00 2001
From: kingosticks <kingosticks@gmail.com>
Date: Sun, 4 Jan 2015 20:54:13 +0000
Subject: [PATCH 5/5] Update changelog

(cherry picked from commit e252dd3a555679cbf49e77ee03c1df7599dabc38)

Conflicts:
	docs/changelog.rst
---
 docs/changelog.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1b88c489..40d5cedc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,14 @@ Changelog
 This changelog is used to track all major changes to Mopidy.
 
 
+v0.19.6 (UNRELEASED)
+====================
+
+Bug fix release.
+
+- Audio: Support UTF-8 in M3U playlists. (Fixes: :issue:`853`)
+
+
 v0.19.5 (2014-12-23)
 ====================