[apt-proxy-devel] r622 - trunk/apt_proxy

[Chris Halls]

Author: halls
Date: Mon Aug 14 12:45:22 2006
New Revision: 622

Modified:
   trunk/apt_proxy/apt_proxy_conf.py

Log:
Allow a port name or number for http_proxy


Modified: trunk/apt_proxy/apt_proxy_conf.py
==============================================================================
--- trunk/apt_proxy/apt_proxy_conf.py	(original)
+++ trunk/apt_proxy/apt_proxy_conf.py	Mon Aug 14 12:45:22 2006
@@ -16,7 +16,7 @@
 
 from apt_proxy import Backend
 from misc import log
-import os, sys
+import os, sys, re
 from types import StringType, NoneType
 import urlparse
 from ConfigParser import RawConfigParser,DEFAULTSECT
@@ -285,10 +285,14 @@
     def __init__(self, proxyspec):
         if proxyspec=='':
             return
-        m = re.match('^((?P<user>.*):(?P<password>.*)@)?(?P<host>[a-zA-Z0-9_.+=-]+):(?P<port>[0-9]+)',
+        m = re.match('^((?P<user>.*):(?P<password>.*)@)?(?P<host>[a-zA-Z0-9_.+=-]+):(?P<port>[a-zA-Z0-9]+)',
                      proxyspec)
         if m:
             self.host = m.group('host')
             self.port = m.group('port')
+            try:
+                self.port = int(self.port)
+            except ValueError:
+                pass
             self.user = m.group('user')
             self.password = m.group('password')