diff -Nru twisted-lore-11.0.0/bin/lore twisted-lore-12.1.0/bin/lore --- twisted-lore-11.0.0/bin/lore 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/bin/lore 2011-06-30 12:57:11.000000000 +0000 @@ -1,20 +1,15 @@ #!/usr/bin/env python - # Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. - -### Twisted Preamble -# This makes sure that users don't have to set up their environment -# specially in order to run these programs from bin/. import sys, os -path = os.path.abspath(sys.argv[0]) -while os.path.dirname(path) != path: - if os.path.basename(path).startswith('Twisted'): - sys.path.insert(0, path) - break - path = os.path.dirname(path) -### end of preamble +extra = os.path.dirname(os.path.dirname(sys.argv[0])) +sys.path.insert(0, extra) +try: + import _preamble +except ImportError: + sys.exc_clear() +sys.path.remove(extra) from twisted.lore.scripts.lore import run run() diff -Nru twisted-lore-11.0.0/debian/changelog twisted-lore-12.1.0/debian/changelog --- twisted-lore-11.0.0/debian/changelog 2011-04-18 20:40:29.000000000 +0000 +++ twisted-lore-12.1.0/debian/changelog 2012-06-19 02:48:36.000000000 +0000 @@ -1,3 +1,23 @@ +twisted-lore (12.1.0-1~ppa1~oneiric1) oneiric; urgency=low + + * New upstream version. + * Rebuild package for use in PPA. + + -- Jessica McKellar Mon, 18 Jun 2012 22:48:17 -0400 + +twisted-lore (12.0.0-1~ppa1~oneiric1) oneiric; urgency=low + + * New upstream version. + * Rebuild package for use in PPA. + + -- Jessica McKellar Wed, 15 Feb 2012 12:27:07 -0500 + +twisted-lore (11.1.0-1) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose Wed, 21 Dec 2011 13:04:26 +0100 + twisted-lore (11.0.0-1) unstable; urgency=low * New upstream release. diff -Nru twisted-lore-11.0.0/debian/compat twisted-lore-12.1.0/debian/compat --- twisted-lore-11.0.0/debian/compat 2010-07-21 08:11:16.000000000 +0000 +++ twisted-lore-12.1.0/debian/compat 2012-06-19 02:44:37.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru twisted-lore-11.0.0/debian/control twisted-lore-12.1.0/debian/control --- twisted-lore-11.0.0/debian/control 2011-04-18 20:40:42.000000000 +0000 +++ twisted-lore-12.1.0/debian/control 2012-06-19 02:45:33.000000000 +0000 @@ -3,15 +3,14 @@ Priority: optional Maintainer: Matthias Klose Uploaders: Free Ekanayaka -Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.5-9~), python-twisted-core (>= 11.0), patch +Build-Depends: debhelper (>=7.0.50~), python-all (>= 2.6.6-3~), python-twisted-core (>= 12.1), patch XS-Python-Version: all -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Package: python-twisted-lore Architecture: all -Depends: ${python:Depends}, python-twisted-web (>= 11.0), ${misc:Depends} +Depends: ${python:Depends}, python-twisted-web (>= 12.1), ${misc:Depends} Conflicts: python-twisted (<< 2.1), python2.4-twisted-lore, python2.3-twisted-lore Replaces: python-twisted (<< 2.1), python2.4-twisted-lore, python2.3-twisted-lore -XB-Python-Version: ${python:Versions} Description: Documentation generator with HTML and LaTeX support Twisted Lore is a documentation generator. diff -Nru twisted-lore-11.0.0/debian/rules twisted-lore-12.1.0/debian/rules --- twisted-lore-11.0.0/debian/rules 2010-07-21 08:16:29.000000000 +0000 +++ twisted-lore-12.1.0/debian/rules 2012-06-19 02:44:37.000000000 +0000 @@ -7,6 +7,8 @@ VER := $(shell /usr/bin/python -c 'import sys; print sys.version[:3]') build: build-stamp +build-arch: build-stamp +build-indep: build-stamp build-stamp: $(PYVERS:%=build-python%) touch $@ build-python%: @@ -25,7 +27,7 @@ install-prereq: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep install-python%: install-prereq : # python-twisted-lore diff -Nru twisted-lore-11.0.0/debian/watch twisted-lore-12.1.0/debian/watch --- twisted-lore-11.0.0/debian/watch 2011-02-24 10:50:44.000000000 +0000 +++ twisted-lore-12.1.0/debian/watch 2012-06-19 02:44:37.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://tmrc.mit.edu/mirror/twisted/Lore/(\d+\.\d)/ TwistedLore-([\d\.]*)\.tar\.bz2 +http://tmrc.mit.edu/mirror/twisted/Lore/(\d\.\d)/ TwistedLore-([\d\.]*)\.tar\.bz2 diff -Nru twisted-lore-11.0.0/doc/examples/index.html twisted-lore-12.1.0/doc/examples/index.html --- twisted-lore-11.0.0/doc/examples/index.html 2011-04-02 01:47:22.000000000 +0000 +++ twisted-lore-12.1.0/doc/examples/index.html 2012-06-04 08:46:24.000000000 +0000 @@ -17,6 +17,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/doc/howto/extend-lore.html twisted-lore-12.1.0/doc/howto/extend-lore.html --- twisted-lore-11.0.0/doc/howto/extend-lore.html 2011-04-02 01:47:23.000000000 +0000 +++ twisted-lore-12.1.0/doc/howto/extend-lore.html 2012-06-04 08:46:24.000000000 +0000 @@ -422,6 +422,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/doc/howto/index.html twisted-lore-12.1.0/doc/howto/index.html --- twisted-lore-11.0.0/doc/howto/index.html 2011-04-02 01:47:23.000000000 +0000 +++ twisted-lore-12.1.0/doc/howto/index.html 2012-06-04 08:46:24.000000000 +0000 @@ -18,6 +18,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/doc/howto/lore.html twisted-lore-12.1.0/doc/howto/lore.html --- twisted-lore-11.0.0/doc/howto/lore.html 2011-04-02 01:47:23.000000000 +0000 +++ twisted-lore-12.1.0/doc/howto/lore.html 2012-06-04 08:46:24.000000000 +0000 @@ -364,6 +364,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/doc/index.html twisted-lore-12.1.0/doc/index.html --- twisted-lore-11.0.0/doc/index.html 2011-04-02 01:47:22.000000000 +0000 +++ twisted-lore-12.1.0/doc/index.html 2012-06-04 08:46:24.000000000 +0000 @@ -20,6 +20,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/doc/man/lore-man.html twisted-lore-12.1.0/doc/man/lore-man.html --- twisted-lore-11.0.0/doc/man/lore-man.html 2011-04-02 01:47:23.000000000 +0000 +++ twisted-lore-12.1.0/doc/man/lore-man.html 2012-06-04 08:46:24.000000000 +0000 @@ -119,6 +119,6 @@

Index

- Version: 11.0.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-lore-11.0.0/LICENSE twisted-lore-12.1.0/LICENSE --- twisted-lore-11.0.0/LICENSE 2011-03-22 23:04:17.000000000 +0000 +++ twisted-lore-12.1.0/LICENSE 2012-02-11 13:47:35.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2001-2011 +Copyright (c) 2001-2012 Allen Short Andy Gayton Andrew Bennetts @@ -12,7 +12,7 @@ Donovan Preston Eric Mangold Eyal Lotem -Itamar Shtull-Trauring +Itamar Turner-Trauring James Knight Jason A. Mobarak Jean-Paul Calderone diff -Nru twisted-lore-11.0.0/NEWS twisted-lore-12.1.0/NEWS --- twisted-lore-11.0.0/NEWS 2011-04-02 01:10:15.000000000 +0000 +++ twisted-lore-12.1.0/NEWS 2012-06-02 07:04:01.000000000 +0000 @@ -1,6 +1,36 @@ Ticket numbers in this file can be looked up by visiting http://twistedmatrix.com/trac/ticket/ +Twisted Lore 12.1.0 (2012-06-02) +================================ + +Bugfixes +-------- + - twisted.plugins.twisted_lore's MathProcessor plugin is now + associated with the correct implementation module. (#5326) + + +Twisted Lore 12.0.0 (2012-02-10) +================================ + +No significant changes have been made for this release. + + +Twisted Lore 11.1.0 (2011-11-15) +================================ + +Bugfixes +-------- + - When run from an unpacked source tarball or a VCS checkout, + bin/lore/lore will now use the version of Twisted it is part of. + (#3526) + +Deprecations and Removals +------------------------- + - Removed compareMarkPos and comparePosition from lore.tree, + deprecated in Twisted 9.0. (#5127) + + Twisted Lore 11.0.0 (2011-04-01) ================================ diff -Nru twisted-lore-11.0.0/README twisted-lore-12.1.0/README --- twisted-lore-11.0.0/README 2011-04-02 01:10:15.000000000 +0000 +++ twisted-lore-12.1.0/README 2012-06-02 07:04:01.000000000 +0000 @@ -1,3 +1,3 @@ -Twisted Lore 11.0.0 +Twisted Lore 12.1.0 Twisted Lore depends on Twisted and Twisted Web. diff -Nru twisted-lore-11.0.0/twisted/lore/latex.py twisted-lore-12.1.0/twisted/lore/latex.py --- twisted-lore-11.0.0/twisted/lore/latex.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/latex.py 2011-04-06 02:20:28.000000000 +0000 @@ -6,7 +6,7 @@ """ from xml.dom import minidom as dom -import os.path, re, string +import os.path, re from cStringIO import StringIO import urlparse @@ -207,7 +207,7 @@ def visitNode_a_listing(self, node): fileName = os.path.join(self.currDir, node.getAttribute('href')) self.writer('\\begin{verbatim}\n') - lines = map(string.rstrip, open(fileName).readlines()) + lines = map(str.rstrip, open(fileName).readlines()) skipLines = int(node.getAttribute('skipLines') or 0) lines = lines[skipLines:] self.writer(text.removeLeadingTrailingBlanks('\n'.join(lines))) diff -Nru twisted-lore-11.0.0/twisted/lore/scripts/lore.py twisted-lore-12.1.0/twisted/lore/scripts/lore.py --- twisted-lore-11.0.0/twisted/lore/scripts/lore.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/scripts/lore.py 2011-10-18 10:31:11.000000000 +0000 @@ -42,12 +42,8 @@ ["prefixurl", None, "", "The prefix to stick on to relative links; only useful when processing directories"], ] - #zsh_altArgDescr = {"foo":"use this description for foo instead"} - #zsh_multiUse = ["foo", "bar"] - #zsh_mutuallyExclusive = [("foo", "bar"), ("bar", "baz")] - #zsh_actions = {"foo":'_files -g "*.foo"', "bar":"(one two three)"} - #zsh_actionDescr = {"logfile":"log file name", "random":"random seed"} - zsh_extras = ["*:files:_files"] + compData = usage.Completions( + extraActions=[usage.CompleteFiles(descr="files", repeat=True)]) def __init__(self, *args, **kw): usage.Options.__init__(self, *args, **kw) diff -Nru twisted-lore-11.0.0/twisted/lore/test/test_lint.py twisted-lore-12.1.0/twisted/lore/test/test_lint.py --- twisted-lore-11.0.0/twisted/lore/test/test_lint.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/test/test_lint.py 2011-07-14 19:05:14.000000000 +0000 @@ -75,7 +75,7 @@ '

foo

A link.' '') - self.assertEquals(self._lintCheck(True, documentSource), "") + self.assertEqual(self._lintCheck(True, documentSource), "") def test_textMatchesRef(self): @@ -91,7 +91,7 @@ '%s' '' '') - self.assertEquals( + self.assertEqual( self._lintCheck(True, documentSource % ("http://bar/baz",)), "") self.assertIn( "link text does not match href", diff -Nru twisted-lore-11.0.0/twisted/lore/test/test_lmath.py twisted-lore-12.1.0/twisted/lore/test/test_lmath.py --- twisted-lore-11.0.0/twisted/lore/test/test_lmath.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/test/test_lmath.py 2012-03-13 18:28:39.000000000 +0000 @@ -9,10 +9,29 @@ from twisted.trial.unittest import TestCase from twisted.python.filepath import FilePath +from twisted.lore.scripts.lore import IProcessor + +from twisted.plugin import getPlugins from twisted.lore.lmath import formulaeToImages +class PluginTests(TestCase): + """ + Tests for the plugin which lets L{twisted.lore.lmath} be used from the lore + command line tool. + """ + def test_discoverable(self): + """ + The plugin for L{twisted.lore.lmath} can be discovered by querying for + L{IProcessor} plugins. + """ + plugins = getPlugins(IProcessor) + lmath = [p for p in plugins if p.name == "mlore"] + self.assertEqual(len(lmath), 1, "Did not find math lore plugin: %r" % (lmath,)) + + + class FormulaeTests(TestCase): """ Tests for L{formulaeToImages}. diff -Nru twisted-lore-11.0.0/twisted/lore/test/test_lore.py twisted-lore-12.1.0/twisted/lore/test/test_lore.py --- twisted-lore-11.0.0/twisted/lore/test/test_lore.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/test/test_lore.py 2011-07-14 19:05:14.000000000 +0000 @@ -36,7 +36,6 @@ from twisted.trial import unittest from twisted.python.filepath import FilePath -from twisted.python.versions import Version from twisted.lore import tree, process, indexer, numberer, htmlbook, default from twisted.lore.default import factory @@ -318,7 +317,7 @@ actual = process.outputdirGenerator(join("/", 'home', 'joe', "myfile.html"), '.xhtml', inputdir, outputdir) expected = normp(join("/", 'away', 'joseph', 'myfile.xhtml')) - self.assertEquals(expected, actual) + self.assertEqual(expected, actual) def test_outputdirGeneratorBadInput(self): options = {'outputdir': '/away/joseph/', 'inputdir': '/home/joe/' } @@ -393,7 +392,7 @@ } dct = book.__dict__ for k in dct: - self.assertEquals(dct[k], expected[k]) + self.assertEqual(dct[k], expected[k]) def test_runningLore(self): options = lore.Options() @@ -413,7 +412,7 @@ '--index=%s' % indexFilename ]) result = lore.runGivenOptions(options) - self.assertEquals(None, result) + self.assertEqual(None, result) self.assertEqualFiles1("lore_index_file_unnumbered_out.html", indexFilename + ".html") @@ -436,7 +435,7 @@ '--index=%s' % indexFilename ]) result = lore.runGivenOptions(options) - self.assertEquals(None, result) + self.assertEqual(None, result) self.assertEqual( # XXX This doesn't seem like a very good index file. @@ -523,7 +522,7 @@ inputFilename, inputFilename2]) result = lore.runGivenOptions(options) - self.assertEquals(None, result) + self.assertEqual(None, result) #self.assertEqualFiles1("lore_index_file_out_multiple.html", indexFilename + ".tns") # VVV change to new, numbered files self.assertEqualFiles("lore_numbering_test_out.html", "lore_numbering_test.tns") @@ -598,7 +597,7 @@ tree.setIndexLink(templ, indexFilename) - self.assertEquals( + self.assertEqual( [], domhelpers.findElementsWithAttribute(templ, "class", @@ -619,7 +618,7 @@ tree.setIndexLink(templ, indexFilename) - self.assertEquals( + self.assertEqual( [], domhelpers.findElementsWithAttribute(templ, "class", @@ -1197,32 +1196,3 @@ """ processor = lore.getProcessor("lore", "html", options) self.assertNotIdentical(processor, None) - - - -class DeprecationTests(unittest.TestCase): - """ - Tests for deprecated APIs in L{twisted.lore.tree}. - """ - def test_comparePosition(self): - """ - L{tree.comparePosition} is deprecated. - """ - from twisted.web.microdom import parseString - element = parseString('').documentElement - self.assertEqual( - self.callDeprecated( - Version('Twisted', 9, 0, 0), - tree.comparePosition, element, element), - 0) - - - def test_compareMarkPos(self): - """ - L{tree.compareMarkPos} is deprecated. - """ - self.assertEqual( - self.callDeprecated( - Version('Twisted', 9, 0, 0), - tree.compareMarkPos, [0, 1], [1, 2]), - -1) diff -Nru twisted-lore-11.0.0/twisted/lore/test/test_man2lore.py twisted-lore-12.1.0/twisted/lore/test/test_man2lore.py --- twisted-lore-11.0.0/twisted/lore/test/test_man2lore.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/test/test_man2lore.py 2011-07-14 19:05:14.000000000 +0000 @@ -50,7 +50,7 @@ inputFile.seek(0) outputFile = StringIO() self.converter.convert(inputFile, outputFile) - self.assertEquals( + self.assertEqual( outputFile.getvalue(), _TRANSITIONAL_XHTML_DTD + expectedOutput) diff -Nru twisted-lore-11.0.0/twisted/lore/test/test_scripts.py twisted-lore-12.1.0/twisted/lore/test/test_scripts.py --- twisted-lore-11.0.0/twisted/lore/test/test_scripts.py 1970-01-01 00:00:00.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/test/test_scripts.py 2011-10-18 10:31:11.000000000 +0000 @@ -0,0 +1,27 @@ +# Copyright (c) Twisted Matrix Laboratories. +# See LICENSE for details. + +""" +Tests for the command-line interface to lore. +""" + +from twisted.trial.unittest import TestCase +from twisted.scripts.test.test_scripts import ScriptTestsMixin +from twisted.python.test.test_shellcomp import ZshScriptTestMixin + + + +class ScriptTests(TestCase, ScriptTestsMixin): + """ + Tests for all one of lore's scripts. + """ + def test_lore(self): + self.scriptTest("lore/lore") + + + +class ZshIntegrationTestCase(TestCase, ZshScriptTestMixin): + """ + Test that zsh completion functions are generated without error + """ + generateFor = [('lore', 'twisted.lore.scripts.lore.Options')] diff -Nru twisted-lore-11.0.0/twisted/lore/tree.py twisted-lore-12.1.0/twisted/lore/tree.py --- twisted-lore-11.0.0/twisted/lore/tree.py 2011-02-14 04:45:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/tree.py 2011-06-16 18:53:00.000000000 +0000 @@ -3,7 +3,7 @@ from itertools import count -import re, os, cStringIO, time, cgi, string, urlparse +import re, os, cStringIO, time, cgi, urlparse from xml.dom import minidom as dom from xml.sax.handler import ErrorHandler, feature_validation from xml.dom.pulldom import SAX2DOM @@ -12,8 +12,6 @@ from twisted.python import htmlizer, text from twisted.python.filepath import FilePath -from twisted.python.deprecate import deprecated -from twisted.python.versions import Version from twisted.web import domhelpers import process, latex, indexer, numberer, htmlbook @@ -199,7 +197,7 @@ "py-listing"): filename = node.getAttribute("href") outfile = cStringIO.StringIO() - lines = map(string.rstrip, open(os.path.join(dir, filename)).readlines()) + lines = map(str.rstrip, open(os.path.join(dir, filename)).readlines()) skip = node.getAttribute('skipLines') or 0 lines = lines[int(skip):] @@ -471,34 +469,6 @@ -def compareMarkPos(a, b): - """ - Perform in every way identically to L{cmp} for valid inputs. - """ - linecmp = cmp(a[0], b[0]) - if linecmp: - return linecmp - return cmp(a[1], b[1]) -compareMarkPos = deprecated(Version('Twisted', 9, 0, 0))(compareMarkPos) - - - -def comparePosition(firstElement, secondElement): - """ - Compare the two elements given by their position in the document or - documents they were parsed from. - - @type firstElement: C{dom.Element} - @type secondElement: C{dom.Element} - - @return: C{-1}, C{0}, or C{1}, with the same meanings as the return value - of L{cmp}. - """ - return cmp(firstElement._markpos, secondElement._markpos) -comparePosition = deprecated(Version('Twisted', 9, 0, 0))(comparePosition) - - - def findNodeJustBefore(target, nodes): """ Find the last Element which is a sibling of C{target} and is in C{nodes}. diff -Nru twisted-lore-11.0.0/twisted/lore/_version.py twisted-lore-12.1.0/twisted/lore/_version.py --- twisted-lore-11.0.0/twisted/lore/_version.py 2011-04-02 01:10:15.000000000 +0000 +++ twisted-lore-12.1.0/twisted/lore/_version.py 2012-06-02 07:04:01.000000000 +0000 @@ -1,3 +1,3 @@ # This is an auto-generated file. Do not edit it. from twisted.python import versions -version = versions.Version('twisted.lore', 11, 0, 0) +version = versions.Version('twisted.lore', 12, 1, 0) diff -Nru twisted-lore-11.0.0/twisted/plugins/twisted_lore.py twisted-lore-12.1.0/twisted/plugins/twisted_lore.py --- twisted-lore-11.0.0/twisted/plugins/twisted_lore.py 2006-03-12 20:59:12.000000000 +0000 +++ twisted-lore-12.1.0/twisted/plugins/twisted_lore.py 2012-03-13 18:28:39.000000000 +0000 @@ -19,7 +19,7 @@ MathProcessor = _LorePlugin( "mlore", - "twsited.lore.lmath", + "twisted.lore.lmath", "Lore format with LaTeX formula") SlideProcessor = _LorePlugin(