Centralized version number in setup.py

wicd/wicd-client.py

@@ -632,14 +632,14 @@ class TrayIcon(object):
 def usage():
     """ Print usage information. """
     print """
-wicd 1.50
+wicd %s 
 wireless (and wired) connection daemon front-end.
 
 Arguments:
 \t-n\t--no-tray\tRun wicd without the tray icon.
 \t-h\t--help\t\tPrint this help information.
 \t-a\t--no-animate\tRun the tray without network traffic tray animations.
-"""
+""" % wpath.version
 
 def setup_dbus(force=True):
     global bus, daemon, wireless, wired, DBUS_AVAIL

wicd/wicd-daemon.py

@@ -132,8 +132,7 @@ class WicdDaemon(dbus.service.Object):
         anything >= 0. This number is effective starting wicd v1.2.0.
         
         """
-        version = '1.6.0'
-        return version
+        return wpath.version
 
     @dbus.service.method('org.wicd.daemon')
     def SetWiredInterface(self, interface):
@@ -1447,7 +1446,7 @@ class WiredDaemon(dbus.service.Object):
 
 def usage():
     print """
-wicd 1.6.0
+wicd %s 
 wireless (and wired) connection daemon.
 
 Arguments:
@@ -1457,7 +1456,7 @@ Arguments:
 \t-n\t--no-poll\tDon't monitor network status.
 \t-o\t--no-stdout\tDon't redirect stdout.
 \t-h\t--help\t\tPrint this help.
-"""
+""" % wpath.version
 
 def daemonize():
     """ Disconnect from the controlling terminal.

wicd/wpath.py

@@ -17,6 +17,8 @@ current = os.path.dirname(os.path.realpath(__file__)) + '/'
 
 # All directory paths *MUST* end in a /
 
+version = '1.6.0'
+
 # DIRECTORIES
 
 lib = '/usr/lib/wicd/'