Package: python-apt Version: 0.8.0~exp4 Followup-For: Bug #625225 Find attached. I split the diffs and ignored the consistency part of it all.
=== modified file 'doc/source/tutorials/contributing.rst' --- doc/source/tutorials/contributing.rst 2010-05-19 13:15:36 +0000 +++ doc/source/tutorials/contributing.rst 2011-05-13 17:13:52 +0000 @@ -54,7 +54,7 @@ VCS-Browser: http://bazaar.launchpad.net/~mvo/python-apt/mvo/ **jak:** http://bzr.debian.org/users/jak/python-apt/jak - This is Julian Andres Klode's (the documentation author's) branch. This + This is Julian Andres Klode's (the documentation author) branch. This is the place where cleanup and documentation updates happen. It is based off debian-sid. Most stuff happens in debian-sid now.
=== modified file 'doc/source/tutorials/contributing.rst' --- doc/source/tutorials/contributing.rst 2011-05-13 17:15:25 +0000 +++ doc/source/tutorials/contributing.rst 2011-05-13 17:17:53 +0000 @@ -232,8 +232,8 @@ this rule are the documentation, where code is sometimes formatted differently to explain aspects, and functions provided for 0.7 compatibility purposes. -When writing code, use tools like pylint, pyflakes, pychecker and pep8.py from -http://svn.browsershots.org/trunk/devtools/pep8/ to verify that your code is +When writing code, use tools like pylint, pyflakes, pychecker and pep8.py +(all available from Debian/Ubuntu) to verify that your code is OK. Fix all the problems which seem reasonable, and mention the unfixed issues when asking for merge.
=== modified file 'doc/source/tutorials/contributing.rst' --- doc/source/tutorials/contributing.rst 2011-05-13 17:18:43 +0000 +++ doc/source/tutorials/contributing.rst 2011-05-13 17:19:39 +0000 @@ -237,7 +237,7 @@ OK. Fix all the problems which seem reasonable, and mention the unfixed issues when asking for merge. -In order to make the automatic generation of Python 3 code using 2to possible, +In order to make the automatic generation of Python 3 code using 2to3 possible, code written in Python may not utilize any functionality unsupported by 2to3 or deprecated as of Python 2.6.