Merge pull request #166 from aapa/requests-pyopenssl

Add dependencies to make Requests use PyOpenSSL by default

pyfibot/modules/module_urltitle.py

@@ -10,6 +10,7 @@
 import urlparse
 import logging
 import re
+import sys
 from datetime import datetime
 import math
 
@@ -19,6 +20,11 @@
 
 from bs4 import BeautifulSoup
 
+use_lxml = False
+if sys.hexversion < 0x02070000:
+    import lxml
+    use_lxml = True
+
 log = logging.getLogger("urltitle")
 config = None
 bot = None
@@ -63,7 +69,10 @@ def __get_bs(url):
 
     content = r.content
     if content:
-        return BeautifulSoup(content)
+        if use_lxml:
+            return BeautifulSoup(content, 'lxml')
+        else:
+            return BeautifulSoup(content)
     return None
 
 

requirements.txt

@@ -5,6 +5,8 @@ pyyaml
 jsonschema >= 1.0.0
 beautifulsoup4
 pyopenssl
+ndg-httpsclient
+pyasn1
 tvdb_api
 repoze.lru
 pygeoip
@@ -16,3 +18,4 @@ httplib2 >= 0.8.0
 feedparser >= 5.1.3
 service_identity
 python-dateutil >= 2.2
+lxml; python_version < '2.7'