reordered calc.py's aliases, changed remind.py to wait on stop condition, added timeout to url.py

modules/calc.py

@@ -11,7 +11,7 @@ from tools.calculation import eval_equation
 
 BASE_TUMBOLIA_URI = 'https://tumbolia-two.appspot.com/'
 
-@commands('c', 'calc')
+@commands('calc', 'c')
 @example('.c 5 + 3', '8')
 def c(bot, trigger):
 	"""Evaluate some calculation."""

modules/remind.py

@@ -44,7 +44,7 @@ class MonitorThread(threading.Thread):
 					delete_reminder(self._bot, oldtime)
 			if not self._bot.memory["remind"] or not self._bot.stillConnected():
 				self.stop.set()
-			time.sleep(2.5)
+			self.stop.wait(2.5)
 		del self._bot.memory["remind_monitor"]
 
 

modules/url.py

@@ -35,7 +35,7 @@ def title_auto(bot, trigger):
 		if broken:
 			continue
 		try:
-			res = requests.get(url, headers=HEADERS, verify=True)
+			res = requests.get(url, headers=HEADERS, verify=True, timeout=10)
 		except requests.exceptions.ConnectionError:
 			continue
 		try: