@@ -25,11 +25,11 @@ # most reliably. See the help on how to define wget/curl to download # them as well. import re -import ahttp as http +import ahttp from config import conf from channels import * from config import * @@ -54,11 +54,11 @@ # refresh category list def update_categories(self): - html = http.get("http://modarchive.org/index.php?request=view_genres") + html = ahttp.get("http://modarchive.org/index.php?request=view_genres") rx_current = re.compile(r""" >\s+(\w[^<>]+)\s+ | ]+query=(\d+)&[^>]+>(\w[^<]+) """, re.S|re.X) @@ -86,11 +86,11 @@ # download links from dmoz listing def update_streams(self, cat): url = "http://modarchive.org/index.php" params = dict(query=self.catmap[cat], request="search", search_type="genre") - html = http.get(url, params) + html = ahttp.get(url, params) entries = [] rx_mod = re.compile(""" href="(http://api\.modarchive\.org/downloads\.php[?]moduleid=(\d+)[#][^"]+)" .*? /formats/(\w+)\.png"