google: unescape titles. drama: set api endpoints to new domain.

.gitignore

@@ -6,3 +6,5 @@ config
 pep8.py
 .project
 .pydevproject
+*.db
+web

plugins/drama.py

@@ -3,8 +3,8 @@ article'''
 
 from util import hook, http
 
-api_url = "http://encyclopediadramatica.com/api.php?action=opensearch"
-ed_url = "http://encyclopediadramatica.com/"
+api_url = "http://encyclopediadramatica.ch/api.php?action=opensearch"
+ed_url = "http://encyclopediadramatica.ch/"
 
 
 @hook.command('ed')

plugins/google.py

@@ -37,8 +37,8 @@ def google(inp):
 
     result = parsed['responseData']['results'][0]
 
-    title = result['titleNoFormatting']
-    content = result['content']
+    title = http.unescape(result['titleNoFormatting'])
+    content = http.unescape(result['content'])
 
     if len(content) == 0:
         content = "No description available"

plugins/util/http.py

@@ -88,3 +88,9 @@ def to_utf8(s):
 
 def quote_plus(s):
     return _quote_plus(to_utf8(s))
+
+
+def unescape(s):
+    if not s.strip():
+        return s
+    return html.fromstring(s).text_content()