Fix ireplace loop @GonZo

Author: dmptrluke

cloudbot/util/dictionaries.py

@@ -173,6 +173,7 @@ def ireplace(text, old, new, count=None):
     old replaced by new. If the optional argument count is given, only the first count
     occurrences are replaced.
     """
+    last_idx = 0
     idx = 0
     num = 0
     while idx < len(text):
@@ -185,6 +186,10 @@ def ireplace(text, old, new, count=None):
         num += 1
         if count and num >= count:
             break
+        # if the function is just looping, end it
+        if idx == last_idx:
+            break
+        last_idx = int(idx)
     return text
 
 

cloudbot/util/formatting.py

@@ -10,25 +10,30 @@
     GNU General Public License (Version 3)
 """
 
-from cloudbot import hook
-import requests
 import urllib.parse
 import hashlib
 import collections
 import html
 
+import requests
+
+from cloudbot import hook
+
+
 SESSION = collections.OrderedDict()
 API_URL = "http://www.cleverbot.com/webservicemin/"
 
 HEADERS = {
-        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-        'Accept-Language': 'en-us;q=0.8,en;q=0.5',
-        'Pragma': 'no-cache',
-        'Referer': 'http://www.cleverbot.com',
-        'User-Agent': 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19',
-        'X-Moz': 'prefetch'
-    }
+    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+    'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+    'Accept-Language': 'en-us;q=0.8,en;q=0.5',
+    'Pragma': 'no-cache',
+    'Referer': 'http://www.cleverbot.com',
+    'User-Agent': 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like '
+                  'Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19',
+    'X-Moz': 'prefetch'
+}
+
 
 @hook.on_start()
 def init_vars():
@@ -41,6 +46,7 @@ def init_vars():
     SESSION['islearning'] = '1'
     SESSION['cleanslate'] = 'false'
 
+
 def cb_think(text):
     SESSION['stimulus'] = text
     payload = urllib.parse.urlencode(SESSION)
@@ -51,6 +57,7 @@ def cb_think(text):
     SESSION['sessionid'] = data[1]
     return html.unescape(str(data[0]))
 
+
 @hook.command("ask", "cleverbot", "cb")
 def ask(text):
     """ <question> -- Asks Cleverbot <question> """