diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -10,7 +10,7 @@ from node import bin, hex from remoterepo import remoterepository from i18n import _ import repo, os, urllib, urllib2, urlparse, zlib, util, httplib -import errno, keepalive, socket, changegroup, version +import errno, keepalive, socket, changegroup class passwordmgr(urllib2.HTTPPasswordMgrWithDefaultRealm): def __init__(self, ui): @@ -268,7 +268,7 @@ class httprepository(remoterepository): opener = urllib2.build_opener(*handlers) # 1.0 here is the _protocol_ version - opener.addheaders = [('User-agent', version.get_useragent())] + opener.addheaders = [('User-agent', 'mercurial/proto-1.0')] urllib2.install_opener(opener) def url(self): diff --git a/mercurial/version.py b/mercurial/version.py --- a/mercurial/version.py +++ b/mercurial/version.py @@ -10,7 +10,6 @@ Mercurial version """ import os -import sys import re import time @@ -28,16 +27,6 @@ def get_version(doreload=False): version = unknown_version return version -def get_useragent(): - """Return some extended version information for the User-Agent - field in http requests.""" - hgver = get_version() - pyver = '%s(%s)' % (sys.version.split()[0], hex(sys.hexversion)) - ostype = os.name - plat = sys.platform - return 'mercurial/proto-1.0 (Python/%s; Mercurial/%s; %s/%s)' % \ - (pyver, hgver, ostype, plat) - def write_version(version): """Overwrite version file.""" if version == get_version():