--- a/mercurial/httprepo.py Sat Mar 15 12:42:41 2008 -0700
+++ b/mercurial/httprepo.py Mon Mar 17 14:51:36 2008 -0700
@@ -10,7 +10,7 @@
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 @@
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):
--- a/mercurial/version.py Sat Mar 15 12:42:41 2008 -0700
+++ b/mercurial/version.py Mon Mar 17 14:51:36 2008 -0700
@@ -10,8 +10,6 @@
"""
import os
-import os.path
-import sys
import re
import time
@@ -29,16 +27,6 @@
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():