diff -Nru twisted-lore-10.1.0/bin/lore twisted-lore-11.1.0/bin/lore
--- twisted-lore-10.1.0/bin/lore	2009-04-08 21:56:55.000000000 +0000
+++ twisted-lore-11.1.0/bin/lore	2011-06-30 12:57:11.000000000 +0000
@@ -1,20 +1,15 @@
 #!/usr/bin/env python
-
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# 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-10.1.0/debian/changelog twisted-lore-11.1.0/debian/changelog
--- twisted-lore-10.1.0/debian/changelog	2012-01-19 01:16:58.000000000 +0000
+++ twisted-lore-11.1.0/debian/changelog	2012-01-19 00:59:47.000000000 +0000
@@ -1,3 +1,34 @@
+twisted-lore (11.1.0-1~ppa1~maverick1) maverick; urgency=low
+
+  * Rebuild package for use in PPA.
+
+ -- Jessica McKellar <jesstess@mit.edu>  Mon, 16 Jan 2012 11:43:03 -0500
+
+twisted-lore (11.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Dec 2011 13:04:26 +0100
+
+twisted-lore (11.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 18 Apr 2011 22:40:00 +0200
+
+twisted-lore (10.2.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild to add Python 2.7 and drop Python 2.5 support 
+
+ -- Piotr Ożarowski <piotr@debian.org>  Sun, 17 Apr 2011 22:00:26 +0200
+
+twisted-lore (10.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 24 Feb 2011 11:50:47 +0100
+
 twisted-lore (10.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru twisted-lore-10.1.0/debian/control twisted-lore-11.1.0/debian/control
--- twisted-lore-10.1.0/debian/control	2012-01-19 01:16:58.000000000 +0000
+++ twisted-lore-11.1.0/debian/control	2012-01-19 00:59:47.000000000 +0000
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Matthias Klose <doko@debian.org>
 Uploaders: Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.5-9~), python-twisted-core (>= 10.1), patch
+Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.5-9~), python-twisted-core (>= 11.1), patch
 XS-Python-Version: all
 Standards-Version: 3.9.0
 
 Package: python-twisted-lore
 Architecture: all
-Depends: ${python:Depends}, python-twisted-web (>= 10.1), ${misc:Depends}
+Depends: ${python:Depends}, python-twisted-web (>= 11.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}
diff -Nru twisted-lore-10.1.0/debian/patches/lore-man.diff twisted-lore-11.1.0/debian/patches/lore-man.diff
--- twisted-lore-10.1.0/debian/patches/lore-man.diff	1970-01-01 00:00:00.000000000 +0000
+++ twisted-lore-11.1.0/debian/patches/lore-man.diff	2011-02-24 10:49:45.000000000 +0000
@@ -0,0 +1,13 @@
+--- twisted-lore-10.1.0.orig/doc/man/lore.1
++++ twisted-lore-10.1.0/doc/man/lore.1
+@@ -55,8 +55,8 @@
+ .TP
+ \fI--config\fR
+ Add input/output-specific information. 
+-HTML output allows for 'ext=<extension>',
+-'template=<template>' and 'baseurl=<format string for API URLs>'. LaTeX
++HTML output allows for 'ext=<extension>', 'template=<template>'
++and 'baseurl=<format string for API URLs>'. LaTeX
+ output allows for 'section' or 'chapter' in Lore, and nothing in Math-Lore. 
+ Lore output allows for 'ext=<extension>'. Lint output allows nothing.
+ Note that disallowed \fI--config\fR options are merely ignored, and do
diff -Nru twisted-lore-10.1.0/debian/patches/series twisted-lore-11.1.0/debian/patches/series
--- twisted-lore-10.1.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ twisted-lore-11.1.0/debian/patches/series	2011-02-24 10:50:19.000000000 +0000
@@ -0,0 +1 @@
+lore-man.diff
diff -Nru twisted-lore-10.1.0/debian/source/format twisted-lore-11.1.0/debian/source/format
--- twisted-lore-10.1.0/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ twisted-lore-11.1.0/debian/source/format	2012-01-19 01:16:58.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru twisted-lore-10.1.0/debian/watch twisted-lore-11.1.0/debian/watch
--- twisted-lore-10.1.0/debian/watch	2012-01-19 01:16:58.000000000 +0000
+++ twisted-lore-11.1.0/debian/watch	2011-02-24 10:50:44.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-10.1.0/doc/examples/index.html twisted-lore-11.1.0/doc/examples/index.html
--- twisted-lore-10.1.0/doc/examples/index.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/examples/index.html	2011-11-17 10:51:13.000000000 +0000
@@ -17,6 +17,6 @@
 </div>
 
     <p><a href="../howto/index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/doc/howto/extend-lore.html twisted-lore-11.1.0/doc/howto/extend-lore.html
--- twisted-lore-10.1.0/doc/howto/extend-lore.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/howto/extend-lore.html	2011-11-17 10:51:13.000000000 +0000
@@ -30,14 +30,15 @@
 
 <h2>Inputs and Outputs<a name="auto1"/></h2>
 
-<p>Lore works by reading the HTML source of your document, and producing
-whatever output the user specifies on the command line.  If the HTML document
-is well-formed XML that meets a certain minimum standard, Lore will be able to
-to produce some output.  All Lore extensions will be written to redefine the
-<em>input</em>, and most will redefine the output in some way.  The name of
-the default input is <q>lore</q>.  When you write your extension, you will
-come up with a new name for your input, telling Lore what rules to use to
-process the file.</p>
+<p>Lore works by reading the HTML source of your document, and
+producing whatever output the user specifies on the command line.  If
+the HTML document is well-formed XML that meets a certain minimum
+standard, Lore will be able to to produce some output.  All Lore
+extensions will be written to redefine the <em>input</em>, and most
+will redefine the output in some way.  The name of the default input
+is <q>lore</q>.  When you write your extension, you will come up with
+a new name for your input, telling Lore what rules to use to process
+the file.</p>
 
 <p>Lore can produce XHTML, LaTeX, and DocBook document formats, which can be
 displayed directly if you have a user agent capable of viewing them, or
@@ -130,17 +131,18 @@
 </pre><div class="caption">Listing 2: The Input
   Factory - <a href="listings/lore/factory.py-1"><span class="filename">listings/lore/factory.py-1</span></a></div></div>
 
-<p>In Listing 2, we create a subclass of ProcessingFunctionFactory.  This
-class provides a hook for you, a class variable named
-<code>latexSpitters</code>.  This variable tells Lore
-what new class will be generating LaTeX from your input format.  We redefine
-<code>latexSpitters</code> to <code>MyLatexSpitter</code> in the subclass
-because this
-class knows what to do with the new input we have already defined.  Last, you
-must define the module-level variable <code class="py-src-identifier">factory</code>.  It should be an instance with
-  the same
-interface as <code class="py-src-identifier">ProcessingFunctionFactory</code>
-(e.g. an instance of a subclass, in this case, <code class="py-src-identifier">MyProcessingFunctionFactory</code>).</p>
+<p>In Listing 2, we create a subclass of ProcessingFunctionFactory.
+This class provides a hook for you, a class variable
+named <code>latexSpitters</code>.  This variable tells Lore what new
+class will be generating LaTeX from your input format.  We
+redefine <code>latexSpitters</code> to <code>MyLatexSpitter</code> in
+the subclass because this class knows what to do with the new input we
+have already defined.  Last, you must define the module-level
+variable <code class="py-src-identifier">factory</code>.  It should be
+an instance with the same interface
+as <code class="py-src-identifier">ProcessingFunctionFactory</code>
+(e.g. an instance of a subclass, in this
+case, <code class="py-src-identifier">MyProcessingFunctionFactory</code>).</p>
 
 <p>Now let's actually write some code to generate the LaTeX.  Doing this
 requires at least a familiarity with the LaTeX language.  Search Google for
@@ -186,11 +188,11 @@
 </pre><div class="caption">Listing 3:
   spitters.py - <a href="listings/lore/spitters.py-1"><span class="filename">listings/lore/spitters.py-1</span></a></div></div>
 
-<p>The method <code>visitNode_span_productname</code> is
-our handler for &lt;span&gt; tags with the <code>class=&quot;productname&quot;</code>
-identifier.  Lore knows to try methods <code>visitNode_span_*</code> and
-<code>visitNode_div_*</code> whenever it encounters a new
-class in one of these tags.  This is why the class names have to be valid
+<p>The method <code>visitNode_span_productname</code> is our handler
+for &lt;span&gt; tags with the <code>class=&quot;productname&quot;</code>
+identifier.  Lore knows to try methods <code>visitNode_span_*</code>
+and <code>visitNode_div_*</code> whenever it encounters a new class in
+one of these tags.  This is why the class names have to be valid
 Python identifiers.</p>
 
 <p>Now let's see what Lore does with these new classes with the following
@@ -420,6 +422,6 @@
 </div>
 
     <p><a href="index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/doc/howto/index.html twisted-lore-11.1.0/doc/howto/index.html
--- twisted-lore-10.1.0/doc/howto/index.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/howto/index.html	2011-11-17 10:51:13.000000000 +0000
@@ -18,6 +18,6 @@
 </div>
 
     <p><a href="index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/doc/howto/lore.html twisted-lore-11.1.0/doc/howto/lore.html
--- twisted-lore-10.1.0/doc/howto/lore.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/howto/lore.html	2011-11-17 10:51:13.000000000 +0000
@@ -23,22 +23,23 @@
 of XML editor here). Here, we will not cover the specifics of writing XML
 documents, except for a very broad overview.</p>
 
-<p>XML documents contain elements, which are delimited by an opening tag
-which looks like <code>&lt;tag-name attribute=&quot;value&quot;&gt;</code> and ends with
-a closing tag, which looks like <code>&lt;/tag-name&gt;</code>. If an
-elements happen to contain nothing, it can be shortened to
-<code>&lt;tag-name /&gt;</code>. Elements can contain other elements, or
-text. Text can contain any characters except &lt;, &gt; and &amp;. These
-characters are rendered by &amp;lt;, &amp;gt; and &amp;amp;, respectively.</p>
-
-<p>A Lore document is a single <code>html</code> element. Inside this element,
-there are exactly two top-level elements: <code>head</code> and
-<code>body</code>. The <code>head</code> element must contain exactly one
-element: <code>title</code>, containing the title of the document.
-Most of the document will be contained in the <code>body</code> element.
-The <code>body</code> element must start with an <code>h1</code> (top-level
-header) element, which contains the exact same content as the
-<code>title</code> element.</p>
+<p>XML documents contain elements, which are delimited by an opening
+tag which looks like <code>&lt;tag-name attribute=&quot;value&quot;&gt;</code>
+and ends with a closing tag, which looks
+like <code>&lt;/tag-name&gt;</code>. If an elements happen to contain
+nothing, it can be shortened to <code>&lt;tag-name
+/&gt;</code>. Elements can contain other elements, or text. Text can
+contain any characters except &lt;, &gt; and &amp;. These characters
+are rendered by &amp;lt;, &amp;gt; and &amp;amp;, respectively.</p>
+
+<p>A Lore document is a single <code>html</code> element. Inside this
+element, there are exactly two top-level elements: <code>head</code>
+and <code>body</code>. The <code>head</code> element must contain
+exactly one element: <code>title</code>, containing the title of the
+document.  Most of the document will be contained in
+the <code>body</code> element.  The <code>body</code> element must
+start with an <code>h1</code> (top-level header) element, which
+contains the exact same content as the <code>title</code> element.</p>
 
 <p>Thus, a fairly minimal Lore document might look like:</p>
 
@@ -123,8 +124,8 @@
 
 <tr>
 <td colspan="1" rowspan="1"><code>ol</code>, <code>ul</code></td>
-<td colspan="1" rowspan="1">A list. It can be enumerated or bulleted. Inside a list, the element
-<code>li</code> (for a list element) is valid.</td>
+<td colspan="1" rowspan="1">A list. It can be enumerated or bulleted. Inside a list, the
+element <code>li</code> (for a list element) is valid.</td>
 </tr>
 
 <tr>
@@ -165,11 +166,11 @@
 
 <tr>
 <td colspan="1" rowspan="1"><code>pre</code></td>
-<td colspan="1" rowspan="1">Preformatted text, usually for file listings. It can be used with the
-<code>python</code> class to indicate Python syntax coloring. Other possible
-classes are <code>shell</code> (to indicate a shell-transcript) or
-<code>python-interpreter</code> (to indicate an interactive interpreter
-transcript).</td>
+<td colspan="1" rowspan="1">Preformatted text, usually for file listings. It can be used with
+the <code>python</code> class to indicate Python syntax
+coloring. Other possible classes are <code>shell</code> (to indicate a
+shell-transcript) or <code>python-interpreter</code> (to indicate an
+interactive interpreter transcript).</td>
 </tr>
 
 <tr>
@@ -258,7 +259,7 @@
 checkout, do:</p>
 
 <pre class="shell" xml:space="preserve">
-% lore --config template=doc/howto/template.tpl doc/howto/*.xhtml
+% lore --config template=doc/core/howto/template.tpl doc/core/howto/*.xhtml
 </pre>
 
 <p>
@@ -266,7 +267,7 @@
 use a different extension:
 </p>
 <pre class="shell" xml:space="preserve">
-% lore --config ext=.html doc/howto/*.xhtml
+% lore --config ext=.html doc/core/howto/*.xhtml
 </pre>
 <h2>Using Lore to Generate LaTex<a name="auto5"/></h2>
 
@@ -304,8 +305,8 @@
 starting with 0 for the title slide.  Lore will look for a template
 file, either indicated by the <code>--config
 template=mytemplate.tpl</code> or the default template.tpl in the
-current directory.  An example slide template is found in
-<code>doc/examples/slides-template.tpl</code></p>
+current directory.  An example slide template is found
+in <code>doc/examples/slides-template.tpl</code></p>
 
 <p>The slides module currently supports three major output types:
 HTML, Magic Point, and LaTeX.  The options for the latter two will be
@@ -332,12 +333,14 @@
 
 <p>Lore can also produce slides in LaTeX format.  It supports three
 main styles: one slide per page, two per page, and Prosper format,
-with the <code>--config</code> parameters being <code>page</code>,
-<code>twopage</code>, and <code>prosper</code> respectively. Prosper
-is a LaTeX class for creating slides, which can be installed on Debian
-by <code>apt-get install prosper</code> or by visiting <a href="http://sourceforge.net/projects/prosper/" shape="rect">the Prosper SourceForge page</a>.
-LaTeX format slides (using the Prosper option, for example) are
-generated by</p>
+with the <code>--config</code> parameters
+being <code>page</code>, <code>twopage</code>,
+and <code>prosper</code> respectively. Prosper is a LaTeX class for
+creating slides, which can be installed on Debian by <code>apt-get
+install prosper</code> or by
+visiting <a href="http://sourceforge.net/projects/prosper/" shape="rect">the
+Prosper SourceForge page</a>.  LaTeX format slides (using the Prosper
+option, for example) are generated by</p>
 
 <pre class="shell" xml:space="preserve">
 % lore --input lore-slides --output latex \
@@ -361,6 +364,6 @@
 </div>
 
     <p><a href="index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/doc/index.html twisted-lore-11.1.0/doc/index.html
--- twisted-lore-10.1.0/doc/index.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/index.html	2011-11-17 10:51:13.000000000 +0000
@@ -20,6 +20,6 @@
 </div>
 
     <p><a href="howto/index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/doc/man/lore.1 twisted-lore-11.1.0/doc/man/lore.1
--- twisted-lore-10.1.0/doc/man/lore.1	2012-01-19 01:16:58.000000000 +0000
+++ twisted-lore-11.1.0/doc/man/lore.1	2008-08-10 18:06:13.000000000 +0000
@@ -55,8 +55,8 @@
 .TP
 \fI--config\fR
 Add input/output-specific information. 
-HTML output allows for 'ext=<extension>', 'template=<template>'
-and 'baseurl=<format string for API URLs>'. LaTeX
+HTML output allows for 'ext=<extension>',
+'template=<template>' and 'baseurl=<format string for API URLs>'. LaTeX
 output allows for 'section' or 'chapter' in Lore, and nothing in Math-Lore. 
 Lore output allows for 'ext=<extension>'. Lint output allows nothing.
 Note that disallowed \fI--config\fR options are merely ignored, and do
diff -Nru twisted-lore-10.1.0/doc/man/lore-man.html twisted-lore-11.1.0/doc/man/lore-man.html
--- twisted-lore-10.1.0/doc/man/lore-man.html	2010-07-03 14:55:46.000000000 +0000
+++ twisted-lore-11.1.0/doc/man/lore-man.html	2011-11-17 10:51:13.000000000 +0000
@@ -119,6 +119,6 @@
 </div>
 
     <p><a href="../howto/index.html">Index</a></p>
-    <span class="version">Version: 10.1.0</span>
+    <span class="version">Version: 11.1.0</span>
   </body>
 </html>
\ No newline at end of file
diff -Nru twisted-lore-10.1.0/LICENSE twisted-lore-11.1.0/LICENSE
--- twisted-lore-10.1.0/LICENSE	2010-01-17 00:03:58.000000000 +0000
+++ twisted-lore-11.1.0/LICENSE	2011-05-05 02:48:02.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2010
+Copyright (c) 2001-2011
 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-10.1.0/NEWS twisted-lore-11.1.0/NEWS
--- twisted-lore-10.1.0/NEWS	2010-06-27 11:23:16.000000000 +0000
+++ twisted-lore-11.1.0/NEWS	2011-11-15 16:39:18.000000000 +0000
@@ -1,6 +1,37 @@
 Ticket numbers in this file can be looked up by visiting
 http://twistedmatrix.com/trac/ticket/<number>
 
+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)
+================================
+
+No significant changes have been made for this release.
+
+
+Twisted Lore 10.2.0 (2010-11-29)
+================================
+
+No significant changes have been made for this release.
+
+Other
+-----
+ - #4571
+
+
 Twisted Lore 10.1.0 (2010-06-27)
 ================================
 
diff -Nru twisted-lore-10.1.0/README twisted-lore-11.1.0/README
--- twisted-lore-10.1.0/README	2010-06-27 11:23:16.000000000 +0000
+++ twisted-lore-11.1.0/README	2011-11-15 16:39:18.000000000 +0000
@@ -1,3 +1,3 @@
-Twisted Lore 10.1.0
+Twisted Lore 11.1.0
 
 Twisted Lore depends on Twisted and Twisted Web.
diff -Nru twisted-lore-10.1.0/setup.py twisted-lore-11.1.0/setup.py
--- twisted-lore-10.1.0/setup.py	2008-10-26 21:37:04.000000000 +0000
+++ twisted-lore-11.1.0/setup.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 import sys
diff -Nru twisted-lore-10.1.0/twisted/lore/default.py twisted-lore-11.1.0/twisted/lore/default.py
--- twisted-lore-10.1.0/twisted/lore/default.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/default.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/docbook.py twisted-lore-11.1.0/twisted/lore/docbook.py
--- twisted-lore-10.1.0/twisted/lore/docbook.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/docbook.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/htmlbook.py twisted-lore-11.1.0/twisted/lore/htmlbook.py
--- twisted-lore-10.1.0/twisted/lore/htmlbook.py	2004-08-25 08:36:30.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/htmlbook.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 
diff -Nru twisted-lore-10.1.0/twisted/lore/indexer.py twisted-lore-11.1.0/twisted/lore/indexer.py
--- twisted-lore-10.1.0/twisted/lore/indexer.py	2004-08-25 08:36:30.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/indexer.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 
diff -Nru twisted-lore-10.1.0/twisted/lore/__init__.py twisted-lore-11.1.0/twisted/lore/__init__.py
--- twisted-lore-10.1.0/twisted/lore/__init__.py	2008-07-29 20:13:54.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/__init__.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 # 
diff -Nru twisted-lore-10.1.0/twisted/lore/latex.py twisted-lore-11.1.0/twisted/lore/latex.py
--- twisted-lore-10.1.0/twisted/lore/latex.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/latex.py	2011-04-06 02:20:28.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
@@ -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-10.1.0/twisted/lore/lint.py twisted-lore-11.1.0/twisted/lore/lint.py
--- twisted-lore-10.1.0/twisted/lore/lint.py	2009-11-18 03:22:03.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/lint.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/lmath.py twisted-lore-11.1.0/twisted/lore/lmath.py
--- twisted-lore-10.1.0/twisted/lore/lmath.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/lmath.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/man2lore.py twisted-lore-11.1.0/twisted/lore/man2lore.py
--- twisted-lore-10.1.0/twisted/lore/man2lore.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/man2lore.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- test-case-name: twisted.lore.test.test_man2lore -*-
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/numberer.py twisted-lore-11.1.0/twisted/lore/numberer.py
--- twisted-lore-10.1.0/twisted/lore/numberer.py	2004-08-25 08:36:30.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/numberer.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 
diff -Nru twisted-lore-10.1.0/twisted/lore/process.py twisted-lore-11.1.0/twisted/lore/process.py
--- twisted-lore-10.1.0/twisted/lore/process.py	2005-04-12 19:32:57.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/process.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- test-case-name: twisted.lore.test.test_lore -*-
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 #
diff -Nru twisted-lore-10.1.0/twisted/lore/scripts/lore.py twisted-lore-11.1.0/twisted/lore/scripts/lore.py
--- twisted-lore-10.1.0/twisted/lore/scripts/lore.py	2009-11-20 23:08:39.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/scripts/lore.py	2011-10-18 10:31:11.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 import sys
@@ -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-10.1.0/twisted/lore/slides.py twisted-lore-11.1.0/twisted/lore/slides.py
--- twisted-lore-10.1.0/twisted/lore/slides.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/slides.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- test-case-name: twisted.lore.test.test_slides -*-
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/test/test_docbook.py twisted-lore-11.1.0/twisted/lore/test/test_docbook.py
--- twisted-lore-10.1.0/twisted/lore/test/test_docbook.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_docbook.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/test/test_latex.py twisted-lore-11.1.0/twisted/lore/test/test_latex.py
--- twisted-lore-10.1.0/twisted/lore/test/test_latex.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_latex.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/test/test_lint.py twisted-lore-11.1.0/twisted/lore/test/test_lint.py
--- twisted-lore-10.1.0/twisted/lore/test/test_lint.py	2009-11-18 03:22:03.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_lint.py	2011-07-14 19:05:14.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
@@ -75,7 +75,7 @@
             '<body><h1>foo</h1><a>A link.</a></body>'
             '</html>')
 
-        self.assertEquals(self._lintCheck(True, documentSource), "")
+        self.assertEqual(self._lintCheck(True, documentSource), "")
 
 
     def test_textMatchesRef(self):
@@ -91,7 +91,7 @@
             '<a href="http://bar/baz">%s</a>'
             '</body>'
             '</html>')
-        self.assertEquals(
+        self.assertEqual(
             self._lintCheck(True, documentSource % ("http://bar/baz",)), "")
         self.assertIn(
             "link text does not match href",
diff -Nru twisted-lore-10.1.0/twisted/lore/test/test_lmath.py twisted-lore-11.1.0/twisted/lore/test/test_lmath.py
--- twisted-lore-10.1.0/twisted/lore/test/test_lmath.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_lmath.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/test/test_lore.py twisted-lore-11.1.0/twisted/lore/test/test_lore.py
--- twisted-lore-10.1.0/twisted/lore/test/test_lore.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_lore.py	2011-07-14 19:05:14.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 # ++ single anchor added to individual output file
@@ -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('<foo/>').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-10.1.0/twisted/lore/test/test_man2lore.py twisted-lore-11.1.0/twisted/lore/test/test_man2lore.py
--- twisted-lore-10.1.0/twisted/lore/test/test_man2lore.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_man2lore.py	2011-07-14 19:05:14.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 
@@ -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-10.1.0/twisted/lore/test/test_scripts.py twisted-lore-11.1.0/twisted/lore/test/test_scripts.py
--- twisted-lore-10.1.0/twisted/lore/test/test_scripts.py	1970-01-01 00:00:00.000000000 +0000
+++ twisted-lore-11.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-10.1.0/twisted/lore/test/test_slides.py twisted-lore-11.1.0/twisted/lore/test/test_slides.py
--- twisted-lore-10.1.0/twisted/lore/test/test_slides.py	2009-02-22 21:03:48.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/test/test_slides.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
diff -Nru twisted-lore-10.1.0/twisted/lore/texi.py twisted-lore-11.1.0/twisted/lore/texi.py
--- twisted-lore-10.1.0/twisted/lore/texi.py	2004-08-25 08:36:30.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/texi.py	2011-02-14 04:45:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 # 
diff -Nru twisted-lore-10.1.0/twisted/lore/tree.py twisted-lore-11.1.0/twisted/lore/tree.py
--- twisted-lore-10.1.0/twisted/lore/tree.py	2009-05-12 20:27:53.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/tree.py	2011-06-16 18:53:00.000000000 +0000
@@ -1,9 +1,9 @@
-# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
+# Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 
 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-10.1.0/twisted/lore/_version.py twisted-lore-11.1.0/twisted/lore/_version.py
--- twisted-lore-10.1.0/twisted/lore/_version.py	2010-06-27 11:23:16.000000000 +0000
+++ twisted-lore-11.1.0/twisted/lore/_version.py	2011-11-15 16:39:18.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', 10, 1, 0)
+version = versions.Version('twisted.lore', 11, 1, 0)