From bc93a11141c5154a8aee5c59107eec54acf084f8 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Tue, 10 Jan 2017 14:45:57 -0500
Subject: [PATCH] Fix #2382: replaygain backend parsing on Python 3

---
 beetsplug/replaygain.py | 6 +++---
 docs/changelog.rst      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/beetsplug/replaygain.py b/beetsplug/replaygain.py
index c2376ce60..eaa01d3a9 100644
--- a/beetsplug/replaygain.py
+++ b/beetsplug/replaygain.py
@@ -194,8 +194,8 @@ class Bs1770gainBackend(Backend):
         """
         # Construct shell command.
         cmd = [self.command]
-        cmd = cmd + [self.method]
-        cmd = cmd + ['-p']
+        cmd += [self.method]
+        cmd += ['-p']
 
         # Workaround for Windows: the underlying tool fails on paths
         # with the \\?\ prefix, so we don't use it here. This
@@ -227,7 +227,7 @@ class Bs1770gainBackend(Backend):
             ':|done\\.\\s)', re.DOTALL | re.UNICODE)
         results = re.findall(regex, data)
         for parts in results[0:num_lines]:
-            part = parts.split(b'\n')
+            part = parts.split(u'\n')
             if len(part) == 0:
                 self._log.debug(u'bad tool output: {0!r}', text)
                 raise ReplayGainError(u'bs1770gain failed')
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a6de16f9c..4e0d7405f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,8 @@ New features:
 Fixes:
 
 * :doc:`/plugins/mpdupdate`: Fix Python 3 compatibility. :bug:`2381`
+* :doc:`/plugins/replaygain`: Fix Python 3 compatibility in the ``bs1770gain``
+  backend. :bug:`2382`
 
 
 1.4.3 (January 9, 2017)