diff options
author | Guido van Rossum <guido@python.org> | 2000-08-24 16:18:04 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2000-08-24 16:18:04 +0000 |
commit | 906416f5675556debe8ca6d02a2fa1f06019ff9f (patch) | |
tree | f722093e5d715a5033c81ac5bbeb844936e93dcd /Lib | |
parent | c498725deb200c601676f75cc28421b8596fe88d (diff) | |
download | cpython-906416f5675556debe8ca6d02a2fa1f06019ff9f.tar.gz |
Promote the server version from a local variable to a class variable,
so that a subclass can override it.
This partly addresses Bug #112634 -- but the documentation is still
wrong, since it suggests that you can set self.version *after* calling
the base class __init__. In fact it must be done *before*.
I'll fix that too.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/urllib.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index cdea6311c3..7275a5a798 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -28,7 +28,7 @@ import os import sys -__version__ = '1.12' # XXX This version is not always updated :-( +__version__ = '1.13' # XXX This version is not always updated :-( MAXFTPCACHE = 10 # Trim the ftp cache beyond this size @@ -82,6 +82,8 @@ class URLopener: __tempfiles = None + version = "Python-urllib/%s" % __version__ + # Constructor def __init__(self, proxies=None, **x509): if proxies is None: @@ -90,8 +92,7 @@ class URLopener: self.proxies = proxies self.key_file = x509.get('key_file') self.cert_file = x509.get('cert_file') - server_version = "Python-urllib/%s" % __version__ - self.addheaders = [('User-agent', server_version)] + self.addheaders = [('User-agent', self.version)] self.__tempfiles = [] self.__unlink = os.unlink # See cleanup() self.tempcache = None |