svninfo no longer needed...

diff --git a/src/main.py b/src/main.py
index a85a4ee818acd5bc23cd514dab6b7f1043ef625b..5093837a13e7cd2e735875f4c6578b90ef7ec9f3 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -95,7 +95,6 @@ from twisted.words.protocols.jabber.jid import internJID
 from debug import LogEvent, INFO, WARN, ERROR
 
 import debug
 from debug import LogEvent, INFO, WARN, ERROR
 
 import debug

-import svninfo

 import utils
 import xdb
 import avatar
 import utils
 import xdb
 import avatar


@@ -114,10 +113,6 @@ import housekeep
 class PyTransport(component.Service):
        def __init__(self):
                LogEvent(INFO)
 class PyTransport(component.Service):
        def __init__(self):
                LogEvent(INFO)

-               try:
-                       LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion()))
-               except:
-                       pass

                LogEvent(INFO, msg="Reactor: " + str(reactor))
 
                # Discovery, as well as some builtin features
                LogEvent(INFO, msg="Reactor: " + str(reactor))
 
                # Discovery, as well as some builtin features

diff --git a/src/misciq.py b/src/misciq.py
index eb27bd78e36e23e4189b426b7b13c4fd0c722cf1..c074f178a4984e6abced7c481d1bc32f3fd8985c 100644 (file)
--- a/src/misciq.py
+++ b/src/misciq.py
@@ -6,7 +6,6 @@ from twisted.internet import reactor, task, protocol, error
 from twisted.words.xish.domish import Element
 from twisted.words.protocols.jabber.jid import internJID
 from debug import LogEvent, INFO, WARN, ERROR
 from twisted.words.xish.domish import Element
 from twisted.words.protocols.jabber.jid import internJID
 from debug import LogEvent, INFO, WARN, ERROR

-import svninfo

 import jabw
 import legacy
 import disco
 import jabw
 import legacy
 import disco


@@ -433,10 +432,6 @@ class VersionTeller:
                self.pytrans = pytrans
                self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, config.jid)
                self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, "USER")
                self.pytrans = pytrans
                self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, config.jid)
                self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, "USER")

-               try:
-                       self.version = "%s - SVN r%s" % (legacy.version, svninfo.getSVNVersion())
-               except:
-                       self.version = legacy.version

                self.os = "Python" + ".".join([str(x) for x in sys.version_info[0:3]]) + " - " + sys.platform
        
        def incomingIq(self, el):
                self.os = "Python" + ".".join([str(x) for x in sys.version_info[0:3]]) + " - " + sys.platform
        
        def incomingIq(self, el):

diff --git a/src/svninfo.py b/src/svninfo.py
deleted file mode 100644 (file)
index 8773ac4..0000000
--- a/src/svninfo.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2006 James Bunton <james@delx.cjb.net> 
-# Licensed for distribution under the GPL version 2, check COPYING for details
-
-from twisted.words.xish.domish import parseFile
-
-import os, os.path
-
-class SVNVersion:
-       def __init__(self):
-               self.version = 0
-
-       def calcRevision(self, svndir):
-               entriesFile = os.path.join(svndir, "entries")
-               doc = parseFile(entriesFile)
-               for child in doc.elements():
-                       try:
-                               num = int(child.getAttribute("committed-rev"))
-                               self.version = max(num, self.version)
-                       except TypeError:
-                               pass
-
-       def traverseDir(self, dirname):
-               for file in os.listdir(dirname):
-                       if os.path.islink(file):
-                               continue
-                       if os.path.isdir(file):
-                               path = os.path.join(dirname, file)
-                               if file == ".svn":
-                                       self.calcRevision(path)
-                               else:
-                                       self.traverseDir(path)
-
-def getSVNVersion(dirname="."):
-       x = SVNVersion()
-       x.traverseDir(dirname)
-       return x.version
-
-if __name__ == "__main__":
-       print getSVNVersion()
-