From: Marek Marecki <marekjm@taistelu.com>
Date: Thu, 8 Aug 2013 17:53:18 +0000 (+0200)
Subject: You can now get list of languages in settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dea56a869381ed050f498300db5957d658f89d4f;p=diaspy.git

You can now get list of languages in settings
---

diff --git a/diaspy/settings.py b/diaspy/settings.py
index 391caf8..410b5e8 100644
--- a/diaspy/settings.py
+++ b/diaspy/settings.py
@@ -1,12 +1,12 @@
+"""This module provides access to user's settings on Diaspora*.
+"""
+
+
 import json
 import re
 import urllib
 
 
-"""This module provides access to user's settings on Diaspora*.
-"""
-
-
 class Settings():
     """This object is used to get access to user's settings on
     Diaspora* and provides interface for downloading user's stuff.
@@ -34,11 +34,15 @@ class Settings():
         """Returns a list of tuples containing ('Language name', 'identifier').
         One of the Black Magic(tm) methods.
         """
-        select_start = '<select id="user_language" name="user[language]"')
+        select_start = '<select id="user_language" name="user[language]">'
         select_end = '</select>'
         languages = []
         request = self._connection.get('user/edit')
-        data = request.text[request.text.find(select_start):]
-        data = data[:data.find(select_end)]
-        print(data)
+        data = request.text[request.text.find(select_start)+len(select_start):]
+        data = data[:data.find(select_end)].split('\n')
+        for item in data:
+            name = item[item.find('>')+1:item.rfind('<')]
+            identifier = item[item.find('"')+1:]
+            identifier = identifier[:identifier.find('"')]
+            languages.append((name, identifier))
         return languages
diff --git a/tests.py b/tests.py
index b7f500f..a45be30 100644
--- a/tests.py
+++ b/tests.py
@@ -230,6 +230,12 @@ class NotificationsTests(unittest.TestCase):
         else:
             warnings.warn('test not sufficient: no unread notifications were found')
 
+
+class SettingsTests(unittest.TestCase):
+    def testGettingLanguages(self):
+        settings = diaspy.settings.Settings(test_connection)
+        self.assertIn(('English', 'en'), settings.getLanguages())
+
 if __name__ == '__main__': 
     print('Hello World!')
     print('It\'s testing time!')