Changeset cef780 in indico

Timestamp:

03/23/11 17:29:21 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

986f31

Parents:

655cb4

Message:

[FIX] Removed 'USSR' from countries

• In Soviet Russia country removes you;
• Created list of old countries;
• Added doctstrings;

File:

• indico/MaKaC/webinterface/common/countries.py (modified) (4 diffs)

indico/MaKaC/webinterface/common/countries.py

@@ -19 +19 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-from MaKaC.i18n import _
-
-class CountryHolder:
+
+class CountryHolder(object):
+    """
+    Contains all countries in the world
+    """
+
+    # old countries that no longer exist
+    _oldCountries = {
+        'SU': "USSR"
+        }
 
     _countries = {}
@@ -218 +225 @@
     _countries['US'] = "UNITED STATES OF AMERICA"
     _countries['UY'] = "URUGUAY"
-    _countries['SU'] = "USSR"
     _countries['UZ'] = "UZBEKISTAN"
     _countries['VA'] = "VATICAN CITY STATE"
@@ -231 +237 @@
     @classmethod
     def getCountries(cls):
+        """
+        Return the whole country dictionary
+        """
         return cls._countries
 
     @classmethod
     def getCountryList( cls ):
+        """
+        Returns all country names
+        """
         return cls._countries.values()
 
     @classmethod
-    def getCountryById( cls, id ):
-        return cls._countries.get(id, "")
+    def getCountryById( cls, cid ):
+        """
+        Returns the country, given its ID
+        """
+        return cls._countries.get(cid,
+                                  cls._oldCountries.get(cid, cid))
 
     @classmethod
     def getCountryKeys(cls):
+        """
+        Returns all country ids
+        """
         return cls._countries.keys()
 
     @classmethod
     def getCountrySortedKeys(cls):
+        """
+        Country ids, sorted alphabetically by country name
+        """
         keys = cls.getCountryKeys()
         keys.sort(cls._sortByValue)
@@ -253 +275 @@
     @classmethod
     def _sortByValue(cls, v1, v2):
+        """
+        Auxiliar function for country id sorting
+        """
         return cmp(cls._countries[v1], cls._countries[v2])