Mercurial Repositories > eric / file diff

--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Thu Jun 02 17:29:13 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Thu Jun 02 20:43:06 2011 +0200
@@ -17,6 +17,7 @@
 from UI.Info import Program
 
 import Preferences
+import Utilities
 
 
 class OpenSearchEngine(QObject):
@@ -39,6 +40,10 @@
         _language = ""
     else:
         _language = loc[:2]
+    _language = _language.replace("_", "-")
+    _country = _language
+    if "-" in _country:
+        _country = _country[_county.index["-"] + 1:]
     
     def __init__(self, parent=None):
         """
@@ -82,6 +87,7 @@
         result = result.replace("{startIndex}", "0")
         result = result.replace("{startPage}", "0")
         result = result.replace("{language}", cls._language)
+        result = result.replace("{country}", cls._country.lower())
         result = result.replace("{inputEncoding}", "UTF-8")
         result = result.replace("{outputEncoding}", "UTF-8")
         result = result.replace("{searchTerms}",
@@ -441,7 +447,8 @@
         """
         Private slot to receive the suggestions.
         """
-        response = str(self.__suggestionsReply.readAll(), "utf-8")
+        buffer = bytes(self.__suggestionsReply.readAll())
+        response = Utilities.decode(buffer)[0]
         response = response.strip()
         
         self.__suggestionsReply.close()