Make python module also protocol independent.

manugarg · Oct 10, 2008 · 9135a26 · 9135a26
1 parent 1b476b8
commit 9135a26
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pymod/__init__.py b/pymod/__init__.py
@@ -32,7 +32,7 @@
 import os
 import re
 
-url_regex = re.compile('(http[s]?|ftp)\:\/\/([^\/]+).*')
+url_regex = re.compile('.*\:\/\/([^\/]+).*')
 
 def init():
   """
@@ -56,8 +56,8 @@ def find_proxy(url, host=None):
     if not m:
       print 'URL: %s is not a valid URL' % url
       return None
-    if len(m.groups()) is 2:
-      host = m.groups()[1]
+    if len(m.groups()) is 1:
+      host = m.groups()[0]
     else:
       print 'URL: %s is not a valid URL' % url
       return None
@@ -85,8 +85,8 @@ def just_find_proxy(pacfile, url, host=None):
     if not m:
       print 'URL: %s is not a valid URL' % url
       return None
-    if len(m.groups()) is 2:
-      host = m.groups()[1]
+    if len(m.groups()) is 1:
+      host = m.groups()[0]
     else:
       print 'URL: %s is not a valid URL' % url
       return None