diff -Nru twisted-news-10.2.0/debian/changelog twisted-news-11.1.0/debian/changelog --- twisted-news-10.2.0/debian/changelog 2011-02-24 11:11:09.000000000 +0000 +++ twisted-news-11.1.0/debian/changelog 2012-01-16 19:12:24.000000000 +0000 @@ -1,3 +1,21 @@ +twisted-news (11.1.0-1~ppa1~natty1) natty; urgency=low + + * Rebuild package for use in PPA. + + -- Jessica McKellar Mon, 16 Jan 2012 14:10:39 -0500 + +twisted-news (11.1.0-1) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose Wed, 21 Dec 2011 12:58:19 +0100 + +twisted-news (11.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose Mon, 18 Apr 2011 22:56:05 +0200 + twisted-news (10.2.0-1) unstable; urgency=low * New upstream release. diff -Nru twisted-news-10.2.0/debian/control twisted-news-11.1.0/debian/control --- twisted-news-10.2.0/debian/control 2011-02-24 11:11:35.000000000 +0000 +++ twisted-news-11.1.0/debian/control 2012-01-16 19:10:07.000000000 +0000 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Matthias Klose Uploaders: Free Ekanayaka -Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.5-9~), python-twisted-core (>= 10.2), 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.1 Package: python-twisted-news Architecture: all -Depends: ${python:Depends}, python-twisted-core (>= 10.2), ${misc:Depends} +Depends: ${python:Depends}, python-twisted-core (>= 11.1), ${misc:Depends} Conflicts: python2.3-twisted-news, python2.4-twisted-news Replaces: python2.3-twisted-news, python2.4-twisted-news XB-Python-Version: ${python:Versions} diff -Nru twisted-news-10.2.0/LICENSE twisted-news-11.1.0/LICENSE --- twisted-news-10.2.0/LICENSE 2010-01-17 00:03:58.000000000 +0000 +++ twisted-news-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-news-10.2.0/NEWS twisted-news-11.1.0/NEWS --- twisted-news-10.2.0/NEWS 2010-11-30 02:27:23.000000000 +0000 +++ twisted-news-11.1.0/NEWS 2011-11-15 16:39:18.000000000 +0000 @@ -1,6 +1,22 @@ Ticket numbers in this file can be looked up by visiting http://twistedmatrix.com/trac/ticket/ +Twisted News 11.1.0 (2011-11-15) +================================ + +No significant changes have been made for this release. + + +Twisted News 11.0.0 (2011-04-01) +================================ + +No significant changes have been made for this release. + +Other +----- + - #4580 + + Twisted News 10.2.0 (2010-11-29) ================================ diff -Nru twisted-news-10.2.0/README twisted-news-11.1.0/README --- twisted-news-10.2.0/README 2010-11-30 02:27:23.000000000 +0000 +++ twisted-news-11.1.0/README 2011-11-15 16:39:18.000000000 +0000 @@ -1,4 +1,4 @@ -Twisted News 10.2.0 +Twisted News 11.1.0 News depends on Twisted, and, if you want to use the moderation features, Twisted Mail. diff -Nru twisted-news-10.2.0/setup.py twisted-news-11.1.0/setup.py --- twisted-news-10.2.0/setup.py 2008-10-26 21:37:04.000000000 +0000 +++ twisted-news-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. try: diff -Nru twisted-news-10.2.0/twisted/news/database.py twisted-news-11.1.0/twisted/news/database.py --- twisted-news-10.2.0/twisted/news/database.py 2010-07-13 20:55:15.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/database.py 2011-02-14 04:45:15.000000000 +0000 @@ -1,5 +1,5 @@ # -*- test-case-name: twisted.news.test -*- -# Copyright (c) 2001-2010 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. """ diff -Nru twisted-news-10.2.0/twisted/news/__init__.py twisted-news-11.1.0/twisted/news/__init__.py --- twisted-news-10.2.0/twisted/news/__init__.py 2006-05-13 19:26:09.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/__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-news-10.2.0/twisted/news/news.py twisted-news-11.1.0/twisted/news/news.py --- twisted-news-10.2.0/twisted/news/news.py 2008-07-29 20:13:54.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/news.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-news-10.2.0/twisted/news/nntp.py twisted-news-11.1.0/twisted/news/nntp.py --- twisted-news-10.2.0/twisted/news/nntp.py 2008-07-29 20:13:54.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/nntp.py 2011-02-14 04:45:15.000000000 +0000 @@ -1,5 +1,5 @@ # -*- test-case-name: twisted.news.test.test_nntp -*- -# Copyright (c) 2001-2004 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. diff -Nru twisted-news-10.2.0/twisted/news/tap.py twisted-news-11.1.0/twisted/news/tap.py --- twisted-news-10.2.0/twisted/news/tap.py 2008-10-28 20:12:14.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/tap.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. @@ -84,7 +84,11 @@ ["datadir", "d", "news.db", "Root data storage path"], ["mailhost", "m", "localhost", "Host of SMTP server to use"] ] - zsh_actions = {"datadir" : "_dirs", "mailhost" : "_hosts"} + compData = usage.Completions( + optActions={"datadir" : usage.CompleteDirs(), + "mailhost" : usage.CompleteHostnames(), + "interface" : usage.CompleteNetInterfaces()} + ) def __init__(self): usage.Options.__init__(self) diff -Nru twisted-news-10.2.0/twisted/news/test/test_database.py twisted-news-11.1.0/twisted/news/test/test_database.py --- twisted-news-10.2.0/twisted/news/test/test_database.py 2010-07-13 20:55:15.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/test/test_database.py 2011-07-14 19:05:14.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2010 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. """ @@ -102,7 +102,7 @@ result = storage.postRequest(message) def cbPosted(ignored): - self.assertEquals(self._email, []) + self.assertEqual(self._email, []) exists = storage.articleExistsRequest(articleID) exists.addCallback(self.assertTrue) return exists @@ -126,14 +126,14 @@ result = storage.postRequest(message) def cbModerated(ignored): - self.assertEquals(len(self._email), 1) - self.assertEquals(self._email[0][0], mailhost) - self.assertEquals(self._email[0][1], sender) - self.assertEquals(self._email[0][2], [moderator]) + self.assertEqual(len(self._email), 1) + self.assertEqual(self._email[0][0], mailhost) + self.assertEqual(self._email[0][1], sender) + self.assertEqual(self._email[0][2], [moderator]) self._checkModeratorMessage( self._email[0][3], sender, moderator, group, message) - self.assertEquals(self._email[0][4], None) - self.assertEquals(self._email[0][5], 25) + self.assertEqual(self._email[0][4], None) + self.assertEqual(self._email[0][5], 25) exists = storage.articleExistsRequest(articleID) exists.addCallback(self.assertFalse) return exists @@ -146,7 +146,7 @@ msg = p.parsestr(messageText) headers = dict(msg.items()) del headers['Message-ID'] - self.assertEquals( + self.assertEqual( headers, {'From': sender, 'To': moderator, @@ -157,9 +157,9 @@ attachment = msg.get_payload()[0] for header in ['from', 'to', 'subject', 'message-id', 'newsgroups']: - self.assertEquals(posting[header], attachment[header]) + self.assertEqual(posting[header], attachment[header]) - self.assertEquals(posting.get_payload(), attachment.get_payload()) + self.assertEqual(posting.get_payload(), attachment.get_payload()) @@ -208,7 +208,7 @@ shelf = NewsShelf('example.com', self.mktemp(), 'alice@example.com') shelf.sendmail = self.sendmail shelf.notifyModerator('bob@example.org', Article('Foo: bar', 'Some text')) - self.assertEquals(len(self._email), 1) + self.assertEqual(len(self._email), 1) def test_defaultSender(self): @@ -220,5 +220,5 @@ shelf = NewsShelf('example.com', self.mktemp()) shelf.sendmail = self.sendmail shelf.notifyModerators(['bob@example.org'], Article('Foo: bar', 'Some text')) - self.assertEquals(self._email[0][1], 'twisted-news@' + gethostname()) + self.assertEqual(self._email[0][1], 'twisted-news@' + gethostname()) self.assertIn('From: twisted-news@' + gethostname(), self._email[0][3]) diff -Nru twisted-news-10.2.0/twisted/news/test/test_news.py twisted-news-11.1.0/twisted/news/test/test_news.py --- twisted-news-10.2.0/twisted/news/test/test_news.py 2006-01-03 03:27:28.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/test/test_news.py 2011-07-14 19:05:14.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2004 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. import sys, types @@ -50,10 +50,10 @@ def cbArticle(result): self.failUnless(isinstance(result, tuple), 'callback result is wrong type: ' + str(result)) - self.assertEquals(len(result), 3, + self.assertEqual(len(result), 3, 'callback result list should have three entries: ' + str(result)) - self.assertEquals(result[1], MESSAGE_ID, + self.assertEqual(result[1], MESSAGE_ID, "callback result Message-Id doesn't match: %s vs %s" % (MESSAGE_ID, result[1])) body = result[2].read() @@ -76,11 +76,11 @@ return d def cbHead(result): - self.assertEquals(result[1], MESSAGE_ID, + self.assertEqual(result[1], MESSAGE_ID, "callback result Message-Id doesn't match: %s vs %s" % (MESSAGE_ID, result[1])) - self.assertEquals(result[2][-2:], '\r\n', + self.assertEqual(result[2][-2:], '\r\n', "headers must be \\r\\n terminated.") d.addCallback(cbArticle) @@ -99,7 +99,7 @@ def cbBody(result): body = result[2].read() - self.assertEquals(body[0:4], 'this', + self.assertEqual(body[0:4], 'this', "message body has been altered: " + pformat(body[0:4])) diff -Nru twisted-news-10.2.0/twisted/news/test/test_nntp.py twisted-news-11.1.0/twisted/news/test/test_nntp.py --- twisted-news-10.2.0/twisted/news/test/test_nntp.py 2006-08-20 10:41:55.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/test/test_nntp.py 2011-07-14 19:05:14.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2004 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. from twisted.trial import unittest @@ -36,39 +36,39 @@ def __init__(self): nntp.NNTPClient.__init__(self) - def assertEquals(self, foo, bar): + def assertEqual(self, foo, bar): if foo != bar: raise AssertionError("%r != %r!" % (foo, bar)) - + def connectionMade(self): nntp.NNTPClient.connectionMade(self) self.fetchSubscriptions() def gotSubscriptions(self, subscriptions): - self.assertEquals(len(subscriptions), len(SUBSCRIPTIONS)) + self.assertEqual(len(subscriptions), len(SUBSCRIPTIONS)) for s in subscriptions: assert s in SUBSCRIPTIONS self.fetchGroups() - + def gotAllGroups(self, info): - self.assertEquals(len(info), len(ALL_GROUPS)) - self.assertEquals(info[0], ALL_GROUPS[0]) - + self.assertEqual(len(info), len(ALL_GROUPS)) + self.assertEqual(info[0], ALL_GROUPS[0]) + self.fetchGroup('alt.test.nntp') - - + + def getAllGroupsFailed(self, error): raise AssertionError("fetchGroups() failed: %s" % (error,)) def gotGroup(self, info): - self.assertEquals(len(info), 6) - self.assertEquals(info, GROUP) - + self.assertEqual(len(info), 6) + self.assertEqual(info, GROUP) + self.postArticle(POST_STRING) - - + + def getSubscriptionsFailed(self, error): raise AssertionError("fetchSubscriptions() failed: %s" % (error,)) @@ -84,17 +84,17 @@ def postedOk(self): self.fetchArticle(1) - + def gotArticle(self, info): origBody = POST_STRING.split('\n\n')[1] newBody = info.split('\n\n', 1)[1] - self.assertEquals(origBody, newBody) - + self.assertEqual(origBody, newBody) + # We're done self.transport.loseConnection() - - + + def getArticleFailed(self, error): raise AssertionError("fetchArticle() failed: %s" % (error,)) @@ -105,7 +105,7 @@ self.server.factory = self self.backend = database.NewsShelf(None, 'news.db') self.backend.addGroup('alt.test.nntp', 'y') - + for s in SUBSCRIPTIONS: self.backend.addSubscription(s) diff -Nru twisted-news-10.2.0/twisted/news/_version.py twisted-news-11.1.0/twisted/news/_version.py --- twisted-news-10.2.0/twisted/news/_version.py 2010-11-30 02:27:23.000000000 +0000 +++ twisted-news-11.1.0/twisted/news/_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.news', 10, 2, 0) +version = versions.Version('twisted.news', 11, 1, 0) diff -Nru twisted-news-10.2.0/twisted/plugins/twisted_news.py twisted-news-11.1.0/twisted/plugins/twisted_news.py --- twisted-news-10.2.0/twisted/plugins/twisted_news.py 2008-04-08 15:53:14.000000000 +0000 +++ twisted-news-11.1.0/twisted/plugins/twisted_news.py 2011-02-14 04:45:15.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2008 Twisted Matrix Laboratories. +# Copyright (c) Twisted Matrix Laboratories. # See LICENSE for details. from twisted.application.service import ServiceMaker