From d64980411d8e524bb6c4b1781c4b633bd225f064 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Tue, 27 Apr 2010 21:25:23 +0200
Subject: [PATCH] Rename m3u conversion helper to parse_m3u

---
 mopidy/backends/gstreamer.py |  4 ++--
 mopidy/utils.py              |  2 +-
 tests/utils_test.py          | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mopidy/backends/gstreamer.py b/mopidy/backends/gstreamer.py
index dbbb3ee2..8af42a77 100644
--- a/mopidy/backends/gstreamer.py
+++ b/mopidy/backends/gstreamer.py
@@ -16,7 +16,7 @@ import threading
 from mopidy.backends import * 
 from mopidy.models import Playlist, Track
 from mopidy import settings
-from mopidy.utils import m3u_to_uris
+from mopidy.utils import parse_m3u
 
 logger = logging.getLogger(u'backends.gstreamer')
 
@@ -127,7 +127,7 @@ class GStreamerStoredPlaylistsController(BaseStoredPlaylistsController):
 
         for m3u in glob.glob(os.path.join(self._folder, '*.m3u')):
             name = os.path.basename(m3u)[:len('.m3u')]
-            track_uris = m3u_to_uris(m3u)
+            track_uris = parse_m3u(m3u)
             tracks = map(lambda u: Track(uri=u), track_uris)
             playlist = Playlist(tracks=tracks, name=name)
 
diff --git a/mopidy/utils.py b/mopidy/utils.py
index eee0cac0..8edbc20d 100644
--- a/mopidy/utils.py
+++ b/mopidy/utils.py
@@ -93,7 +93,7 @@ def spotify_uri_to_int(uri, output_bits=31):
         full_id >>= output_bits
     return int(compressed_id)
 
-def m3u_to_uris(file_path):
+def parse_m3u(file_path):
     """
     Convert M3U file list of uris
 
diff --git a/tests/utils_test.py b/tests/utils_test.py
index 05b5f244..0cc8f1f4 100644
--- a/tests/utils_test.py
+++ b/tests/utils_test.py
@@ -5,7 +5,7 @@ import tempfile
 import unittest
 import urllib
 
-from mopidy.utils import m3u_to_uris
+from mopidy.utils import parse_m3u
 
 def data(name):
     folder = os.path.dirname(__file__)
@@ -24,22 +24,22 @@ encoded_uri = 'file://' + urllib.pathname2url(encoded_path.encode('utf-8'))
 
 class M3UToUriTest(unittest.TestCase):
     def test_empty_file(self):
-        uris = m3u_to_uris(data('empty.m3u'))
+        uris = parse_m3u(data('empty.m3u'))
         self.assertEqual([], uris)
 
     def test_basic_file(self):
-        uris = m3u_to_uris(data('one.m3u'))
+        uris = parse_m3u(data('one.m3u'))
         self.assertEqual([song1_uri], uris)
 
     def test_file_with_comment(self):
-        uris = m3u_to_uris(data('comment.m3u'))
+        uris = parse_m3u(data('comment.m3u'))
         self.assertEqual([song1_uri], uris)
 
     def test_file_with_absolute_files(self):
         with tempfile.NamedTemporaryFile() as file:
             file.write(song1_path)
             file.flush()
-            uris = m3u_to_uris(file.name)
+            uris = parse_m3u(file.name)
         self.assertEqual([song1_uri], uris)
 
     def test_file_with_multiple_absolute_files(self):
@@ -48,16 +48,16 @@ class M3UToUriTest(unittest.TestCase):
             file.write('# comment \n')
             file.write(song2_path)
             file.flush()
-            uris = m3u_to_uris(file.name)
+            uris = parse_m3u(file.name)
         self.assertEqual([song1_uri, song2_uri], uris)
 
     def test_file_with_uri(self):
         with tempfile.NamedTemporaryFile() as file:
             file.write(song1_uri)
             file.flush()
-            uris = m3u_to_uris(file.name)
+            uris = parse_m3u(file.name)
         self.assertEqual([song1_uri], uris)
 
     def test_encoding_is_latin1(self):
-        uris = m3u_to_uris(data('encoding.m3u'))
+        uris = parse_m3u(data('encoding.m3u'))
         self.assertEqual([encoded_uri], uris)