webcheck commit: r420 - webcheck

[Commits of the webcheck project <webcheck-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Jun 18 23:26:22 2011
New Revision: 420
URL: http://arthurdejong.org/viewvc/webcheck?view=rev&revision=420

Log:
move some things from config to webcheck module

Modified:
   webcheck/config.py
   webcheck/webcheck.py

Modified: webcheck/config.py
==============================================================================
--- webcheck/config.py  Sat Jun 18 20:08:51 2011        (r419)
+++ webcheck/config.py  Sat Jun 18 23:26:22 2011        (r420)
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 1998, 1999 Albert Hopkins (marduk)
 # Copyright (C) 2002 Mike Meyer
-# Copyright (C) 2005, 2006, 2007, 2008, 2010 Arthur de Jong
+# Copyright (C) 2005, 2006, 2007, 2008, 2010, 2011 Arthur de Jong
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,12 +29,6 @@
 
 import urllib
 
-# Current version of webcheck.
-VERSION = '1.10.4'
-
-# The homepage of webcheck.
-HOMEPAGE = 'http://arthurdejong.org/webcheck/'
-
 # Whether to consider any URL not starting with the base URL to be external.
 # This is the state of the -b command line option.
 BASE_URLS_ONLY = False

Modified: webcheck/webcheck.py
==============================================================================
--- webcheck/webcheck.py        Sat Jun 18 20:08:51 2011        (r419)
+++ webcheck/webcheck.py        Sat Jun 18 23:26:22 2011        (r420)
@@ -25,6 +25,9 @@
 
 """This is the main webcheck module."""
 
+__version__ = '1.10.4'
+__homepage__ = 'http://arthurdejong.org/webcheck/'
+
 import sys
 import os
 import re
@@ -32,6 +35,10 @@
 import urllib
 
 import config
+# update some fields that currently are stored in config
+config.VERSION = __version__
+config.HOMEPAGE = __homepage__
+
 import crawler
 import plugins
 import debugio
@@ -40,17 +47,18 @@
 
 debugio.loglevel = debugio.INFO
 
+
 def print_version():
     """Print version information."""
     sys.stdout.write(
       'webcheck %(version)s\n'
       'Written by Albert Hopkins (marduk), Mike W. Meyer and Arthur de Jong.\n'
       '\n'
-      'Copyright (C) 1998, 1999, 2002, 2005, 2006, 2007, 2008, 2009, 2010\n'
+      'Copyright (C) 1998-2011\n'
       'Albert Hopkins (marduk), Mike W. Meyer and Arthur de Jong.\n'
       'This is free software; see the source for copying conditions.  There is 
NO\n'
       'warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR 
PURPOSE.\n'
-      % { 'version': config.VERSION })
+      % { 'version': __version__ })
 
 def print_usage():
     """Print short usage information."""
-- 
To unsubscribe send an email to
webcheck-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/webcheck-commits