From 3a6967eb7a4909117466fd20bbc577bf807be70e Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sun, 22 Jan 2017 12:59:04 -0800
Subject: [PATCH] Remove dependencies from convert_stub.py

See: https://github.com/beetbox/beets/pull/2403#issuecomment-274358494
---
 test/rsrc/convert_stub.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/rsrc/convert_stub.py b/test/rsrc/convert_stub.py
index 3ca71352a..f32bce09a 100755
--- a/test/rsrc/convert_stub.py
+++ b/test/rsrc/convert_stub.py
@@ -6,15 +6,19 @@ a specified text tag.
 """
 
 from __future__ import division, absolute_import, print_function
-from os.path import dirname, abspath
-import six
 import sys
 import platform
+import locale
 
-beets_src = dirname(dirname(dirname(abspath(__file__))))
-sys.path.insert(0, beets_src)
+PY2 = sys.version_info[0] == 2
 
-from beets.util import arg_encoding  # noqa: E402
+
+# From `beets.util`.
+def arg_encoding():
+    try:
+        return locale.getdefaultlocale()[1] or 'utf-8'
+    except ValueError:
+        return 'utf-8'
 
 
 def convert(in_file, out_file, tag):
@@ -27,7 +31,7 @@ def convert(in_file, out_file, tag):
     # On Windows, use Unicode paths. (The test harness gives them to us
     # as UTF-8 bytes.)
     if platform.system() == 'Windows':
-        if not six.PY2:
+        if not PY2:
             in_file = in_file.encode(arg_encoding())
             out_file = out_file.encode(arg_encoding())
         in_file = in_file.decode('utf-8')