install_data

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@1403 e7d03fd6-7b0d-0410-9947-9c21f3af8025

Makefile

@@ -12,13 +12,11 @@ HOST=www.debian.org
 LCOPTS=-ocolored -Ftext -Fhtml -Fgml -Fsql -Fcsv -Fxml -R -t0 -v -s -r1
 TEST := test/run.sh test/regrtest.py
 OFFLINETESTS = test_base test_misc test_file test_frames
-ONLINETESTS = test_mail test_http test_https test_news test_ftp test_telnet
 DESTDIR=/.
 MD5SUMS=linkchecker-md5sums.txt
 
-PYCHECKEROPTS := -F pycheckrc
-PYCHECKERFILES := linkcheck/*.py linkcheck/parser/*.py \
-                  linkcheck/DNS/*.py linkcheck/log/*.py
+PYCHECKEROPTS := -F config/pycheckrc
+PYCHECKERFILES := linkcheck/*.py linkcheck/logger/*.py linkcheck/checker/*.py
 
 all:
 	@echo "Read the file INSTALL to see how to build and install"
@@ -27,7 +25,8 @@ clean:
 # ignore errors of this command
 	-$(PYTHON) setup.py clean --all
 	$(MAKE) -C po clean
-	rm -f linkcheck/parser/htmlsax.so
+	rm -f bk/HtmlParser/htmlsax.so
+	rm -f bk/HtmlParser/*.output
 	find . -name '*.py[co]' | xargs rm -f
 
 distclean: clean cleandeb

TODO

@@ -1,10 +1,11 @@
-- no more threading disablement: we have dummy_threading now
-  disable threads for debugging purposes only (internal)
-
 - SF bug #992389 bit me when I wanted to do absolute imports
   at the *UrlData classes :/
   When the bug is fixed we can import absolute classes
 
+- fix url quoting: urls should be quoted as early as possible,
+  and inside the UrlData classes all the time. Makes log output
+  more easy.
+
 - cache queue rework?
 
 - document what checks are performed for each url type

bk/net/dns/Base.py

@@ -48,6 +48,7 @@ class DnsRequest (object):
     def argparse (self, name, config, args):
         self.name = name
         self.config = config
+        args['server'] = self.config.nameservers[0]
         for i in defaults.keys():
             if not args.has_key(i):
                 if self.defaults.has_key(i):
@@ -111,9 +112,8 @@ class DnsRequest (object):
     def conn (self):
         self.s.connect((self.ns, self.port))
 
-    def req (self, name, config, **args):
+    def req (self):
         " needs a refactoring "
-        self.argparse(name, config, args)
         #if not self.args:
         #    raise DNSError,'reinitialize request before reuse'
         protocol = self.args['protocol']

debian/copyright

@@ -46,3 +46,19 @@ optcomplete.py Copyright:
 #* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #******************************************************************************\
 
+dnspython (stored as module bk.dns) Copyright:
+Copyright (C) 2001-2003 Nominum, Inc.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

linkcheck/checker/TelnetUrlData.py

@@ -21,6 +21,7 @@ import urlparse
 import urllib
 import linkcheck
 import HostCheckingUrlData
+import UrlData
 import bk.i18n
 
 
@@ -34,7 +35,7 @@ class TelnetUrlData (HostCheckingUrlData.HostCheckingUrlData):
         self.host, self.port = urllib.splitport(self.host)
         if self.port is not None:
             # XXX is_valid_port move?
-            if not linkcheck.UrlData.is_valid_port(self.port):
+            if not UrlData.is_valid_port(self.port):
                 raise linkcheck.LinkCheckerError(bk.i18n._("URL has invalid port number %s")\
                                       % self.port)
             self.port = int(self.port)

linkchecker

@@ -199,6 +199,8 @@ group.add_option("--status", action="store_true", dest="status",
                  help=bk.i18n._(
 """Print check status every 5 seconds to stderr. Does not work with the
 --debug option."""))
+group.add_option("-D", "--debug", action="count",
+                 help=bk.i18n._("Print debugging output."))
 group.add_option("--profile", action="store_true", dest="profile",
                  help=bk.i18n._(
 """Write profiling data into a file named %s in the
@@ -278,8 +280,6 @@ optparser.add_option_group(group)
 group = optparse.OptionGroup(optparser, bk.i18n._("Deprecated options"))
 group.add_option("-R", "--robots-txt", action="store_true")
 optparser.add_option_group(group)
-group.add_option("-D", "--debug", action="count",
-                 help=bk.i18n._("Deprecated options"))
 
 ################# auto completion #####################
 linkcheck.optcomplete.autocomplete(optparser)

setup.py

@@ -28,6 +28,7 @@ except ImportError:
     import distutils.dist
     distklass = distutils.dist.Distribution
 from distutils.command.install import install
+from distutils.command.install_data import install_data
 from distutils.file_util import write_file
 from distutils import util
 
@@ -166,7 +167,7 @@ myname = "Bastian Kleineidam"
 myemail = "calvin@users.sourceforge.net"
 
 setup (name = "linkchecker",
-       version = "1.12.3",
+       version = "1.13.0",
        description = "check HTML documents for broken links",
        keywords = "link,url,checking,verfication",
        author = myname,