trivia - alias !trivia to !start

[erebus.git] / modules / urls.py

diff --git a/modules/urls.py b/modules/urls.py
index 4c4bf6b54799926a80c0cd825c9c79983036ba3d..0430a638e13a85c8aa9f8eb795417f4deadc85e6 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -20,8 +21,19 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import re, urllib2, urlparse, json, HTMLParser
-from BeautifulSoup import BeautifulSoup
+import sys
+if sys.version_info.major < 3:
+       import urllib2
+       import urlparse
+       import HTMLParser
+       from BeautifulSoup import BeautifulSoup
+else:
+       import urllib.request as urllib2
+       import urllib.parse as urlparse
+       import html.parser as HTMLParser
+       from bs4 import BeautifulSoup
+
+import re, json
 
 html_parser = HTMLParser.HTMLParser()