Commit 3767c663 authored by Andreas Jung's avatar Andreas Jung

transformed urlregex to be regex free

Marshalling code still needs to be converted to re
by someone understanding the code :-)
parent a7e27676
...@@ -103,7 +103,7 @@ that allows one to simply make a single web request. ...@@ -103,7 +103,7 @@ that allows one to simply make a single web request.
The module also provides a command-line interface for calling objects. The module also provides a command-line interface for calling objects.
""" """
__version__='$Revision: 1.40 $'[11:-2] __version__='$Revision: 1.41 $'[11:-2]
import sys, regex, socket, mimetools import sys, regex, socket, mimetools
from httplib import HTTP from httplib import HTTP
...@@ -142,8 +142,9 @@ class Function: ...@@ -142,8 +142,9 @@ class Function:
if password is not None: self.password=password if password is not None: self.password=password
if timeout is not None: self.timeout=timeout if timeout is not None: self.timeout=timeout
if urlregex.match(url) >= 0: mo = urlregex.match(url)
host,port,rurl=urlregex.group(1,2,3) if mo:
host,port,rurl=mo.group(1,2,3)
if port: port=atoi(port[1:]) if port: port=atoi(port[1:])
else: port=80 else: port=80
self.host=host self.host=host
...@@ -346,7 +347,7 @@ def call(url,username=None, password=None, **kw): ...@@ -346,7 +347,7 @@ def call(url,username=None, password=None, **kw):
############################################################################## ##############################################################################
# Implementation details below here # Implementation details below here
urlregex=regex.compile('http://\([^:/]+\)\(:[0-9]+\)?\(/.+\)?', regex.casefold) urlregex=re.compile('http://([^:/]+)(:[0-9]+)?(/.+)?', re.I)
dashtrans=maketrans('_','-') dashtrans=maketrans('_','-')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment