diff --git a/beetsplug/mpdstats.py b/beetsplug/mpdstats.py index dd91228e5..96291cf4c 100644 --- a/beetsplug/mpdstats.py +++ b/beetsplug/mpdstats.py @@ -55,7 +55,6 @@ class MPDClientWrapper: self._log.debug('music_directory: {0}', self.music_directory) self._log.debug('strip_path: {0}', self.strip_path) - # On Python 3, python-mpd2 always uses Unicode self.client = mpd.MPDClient() def connect(self): diff --git a/test/rsrc/convert_stub.py b/test/rsrc/convert_stub.py index f58fa1d96..409c3e336 100755 --- a/test/rsrc/convert_stub.py +++ b/test/rsrc/convert_stub.py @@ -19,16 +19,9 @@ def arg_encoding(): def convert(in_file, out_file, tag): """Copy `in_file` to `out_file` and append the string `tag`. """ - # On Python 3, encode the tag argument as bytes. if not isinstance(tag, bytes): tag = tag.encode('utf-8') - # On Windows, use Unicode paths. On Python 3, we get the actual, - # Unicode filenames. On Python 2, we get them as UTF-8 byes. - # if platform.system() == 'Windows' and PY2: - # in_file = in_file.decode('utf-8') - # out_file = out_file.decode('utf-8') - with open(out_file, 'wb') as out_f: with open(in_file, 'rb') as in_f: out_f.write(in_f.read())