Subliminal update

libs/guessit/guess.py

@@ -18,6 +18,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import unicode_literals
+from guessit import UnicodeMixin, s, u, base_text_type
+from guessit.language import Language
+from guessit.country import Country
 import json
 import datetime
 import logging
@@ -25,7 +29,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class Guess(dict):
+class Guess(UnicodeMixin, dict):
     """A Guess is a dictionary which has an associated confidence for each of
     its values.
 
@@ -44,23 +48,21 @@ class Guess(dict):
         for prop in self:
             self._confidence[prop] = confidence
 
-    def to_utf8_dict(self):
-        from guessit.language import Language
+
+    def to_dict(self):
         data = dict(self)
         for prop, value in data.items():
             if isinstance(value, datetime.date):
                 data[prop] = value.isoformat()
-            elif isinstance(value, Language):
-                data[prop] = str(value)
-            elif isinstance(value, unicode):
-                data[prop] = value.encode('utf-8')
+            elif isinstance(value, (Language, Country, base_text_type)):
+                data[prop] = u(value)
             elif isinstance(value, list):
-                data[prop] = [str(x) for x in value]
+                data[prop] = [u(x) for x in value]
 
         return data
 
     def nice_string(self):
-        data = self.to_utf8_dict()
+        data = self.to_dict()
 
         parts = json.dumps(data, indent=4).split('\n')
         for i, p in enumerate(parts):
@@ -72,8 +74,8 @@ class Guess(dict):
 
         return '\n'.join(parts)
 
-    def __str__(self):
-        return str(self.to_utf8_dict())
+    def __unicode__(self):
+        return u(self.to_dict())
 
     def confidence(self, prop):
         return self._confidence.get(prop, -1)
@@ -138,16 +140,16 @@ def choose_string(g1, g2):
     differ very little, such as one string being the other one with the 'the' word
     prepended to it.
 
-    >>> choose_string(('Hello', 0.75), ('World', 0.5))
+    >>> s(choose_string(('Hello', 0.75), ('World', 0.5)))
     ('Hello', 0.25)
 
-    >>> choose_string(('Hello', 0.5), ('hello', 0.5))
+    >>> s(choose_string(('Hello', 0.5), ('hello', 0.5)))
     ('Hello', 0.75)
 
-    >>> choose_string(('Hello', 0.4), ('Hello World', 0.4))
+    >>> s(choose_string(('Hello', 0.4), ('Hello World', 0.4)))
     ('Hello', 0.64)
 
-    >>> choose_string(('simpsons', 0.5), ('The Simpsons', 0.5))
+    >>> s(choose_string(('simpsons', 0.5), ('The Simpsons', 0.5)))
     ('The Simpsons', 0.75)
 
     """
@@ -285,12 +287,12 @@ def merge_all(guesses, append=None):
     You can specify a list of properties that should be appended into a list
     instead of being merged.
 
-    >>> merge_all([ Guess({ 'season': 2 }, confidence = 0.6),
-    ...             Guess({ 'episodeNumber': 13 }, confidence = 0.8) ])
+    >>> s(merge_all([ Guess({ 'season': 2 }, confidence = 0.6),
+    ...               Guess({ 'episodeNumber': 13 }, confidence = 0.8) ]))
     {'season': 2, 'episodeNumber': 13}
 
-    >>> merge_all([ Guess({ 'episodeNumber': 27 }, confidence = 0.02),
-    ...             Guess({ 'season': 1 }, confidence = 0.2) ])
+    >>> s(merge_all([ Guess({ 'episodeNumber': 27 }, confidence = 0.02),
+    ...               Guess({ 'season': 1 }, confidence = 0.2) ]))
     {'season': 1}
 
     """
@@ -320,7 +322,7 @@ def merge_all(guesses, append=None):
         result.update_highest_confidence(g)
 
     # delete very unlikely values
-    for p in result.keys():
+    for p in list(result.keys()):
         if result.confidence(p) < 0.05:
             del result[p]