From 6eb497b21b478b4e681bce869f4127376ca0399b Mon Sep 17 00:00:00 2001
From: Thomas Scholtes <thomas-scholtes@gmx.de>
Date: Mon, 7 Apr 2014 18:33:12 +0200
Subject: [PATCH] Remove pathlib dependency

---
 setup.py             |  1 -
 test/helper.py       |  3 +--
 test/test_convert.py | 11 +++++------
 tox.ini              |  1 -
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index af8c55466..589a1076c 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,6 @@ setup(name='beets',
 
       tests_require=[
           'responses',
-          'pathlib',
       ],
 
       # Plugin (optional) dependencies:
diff --git a/test/helper.py b/test/helper.py
index e00705b50..eae9f86b6 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -17,7 +17,6 @@ import os
 import os.path
 import shutil
 import tempfile
-from pathlib import Path
 from glob import glob
 from contextlib import contextmanager
 from StringIO import StringIO
@@ -144,7 +143,7 @@ class TestHelper(object):
 
     def add_item_fixtures(self, ext='mp3', count=1):
         items = []
-        paths = list(Path(_common.RSRC).glob('*.' + ext))
+        paths = glob(os.path.join(_common.RSRC, '*.' + ext))
         for path in paths[0:count]:
             item = Item.from_path(str(path))
             item.add(self.lib)
diff --git a/test/test_convert.py b/test/test_convert.py
index 3543e88db..987e28a81 100644
--- a/test/test_convert.py
+++ b/test/test_convert.py
@@ -13,7 +13,6 @@
 # included in all copies or substantial portions of the Software.
 
 import os.path
-from pathlib import Path
 from _common import unittest
 from helper import TestHelper, controlStdin
 
@@ -49,7 +48,7 @@ class ImportCliTest(unittest.TestCase, TestHelper):
         self.item, = self.add_item_fixtures(ext='ogg')
         self.load_plugins('convert')
 
-        self.convert_dest = Path(self.temp_dir) / 'convert_dest'
+        self.convert_dest = os.path.join(self.temp_dir, 'convert_dest')
         self.config['convert']['dest'] = str(self.convert_dest)
         self.config['convert']['command'] = u'cp $source $dest'
         self.config['convert']['paths']['default'] = u'converted'
@@ -61,17 +60,17 @@ class ImportCliTest(unittest.TestCase, TestHelper):
     def test_convert(self):
         with controlStdin('y'):
             self.run_command('convert', self.item.path)
-        converted = Path(self.convert_dest) / 'converted.mp3'
-        self.assertTrue(converted.is_file())
+        converted = os.path.join(self.convert_dest, 'converted.mp3')
+        self.assertTrue(os.path.isfile(converted))
 
     def test_convert_keep_new(self):
-        self.assertEqual(Path(self.item.path).suffix, '.ogg')
+        self.assertEqual(os.path.splitext(self.item.path)[1], '.ogg')
 
         with controlStdin('y'):
             self.run_command('convert', '--keep-new', self.item.path)
 
         self.item.load()
-        self.assertEqual(Path(self.item.path).suffix, '.mp3')
+        self.assertEqual(os.path.splitext(self.item.path)[1], '.mp3')
 
 
 def suite():
diff --git a/tox.ini b/tox.ini
index ee9593cee..efa90aaf0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ deps =
     pylast
     flask
     responses
-    pathlib
 commands =
     nosetests {posargs}
 sitepackages = True