Rev 6072: (gz) Update docs as Python 2.6 is now the minimum supported version (Samuel in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/
Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Aug 31 16:48:47 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/
------------------------------------------------------------
revno: 6072 [merge]
revision-id: pqm at pqm.ubuntu.com-20120831164847-z5fod1ok40qeekom
parent: pqm at pqm.ubuntu.com-20120725134153-msogpdifls1kp5xz
parent: naesten at gmail.com-20120830224544-6ctjctx7wyworzhb
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Fri 2012-08-31 16:48:47 +0000
message:
(gz) Update docs as Python 2.6 is now the minimum supported version (Samuel
Bronson)
modified:
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
doc/developers/code-style.txt codestyle.txt-20100515105711-133ealf7ereiq2eq-1
doc/en/admin-guide/introduction.txt introduction.txt-20091205144603-lgpl0e0z6lzk2rdw-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
=== modified file 'INSTALL'
--- a/INSTALL 2010-06-02 05:03:31 +0000
+++ b/INSTALL 2012-08-30 20:36:18 +0000
@@ -4,9 +4,7 @@
Dependencies
------------
-bzr requires Python2.4 and cElementTree:
-
- http://effbot.org/zone/element-index.htm
+bzr requires Python 2.6 or newer.
If you wish to access branches over sftp, you will need paramiko and
pycrypto:
=== modified file 'doc/developers/code-style.txt'
--- a/doc/developers/code-style.txt 2011-06-28 21:45:01 +0000
+++ b/doc/developers/code-style.txt 2012-08-30 21:54:35 +0000
@@ -77,20 +77,11 @@
Python versions
===============
-Bazaar supports Python from 2.4 through 2.6, and in the future we want to
-support Python 2.7 and 3.0. Avoid using language features added in 2.5,
-2.6 or 2.7, or features deprecated in Python 3.0. (You can check v3
+Bazaar supports Python from 2.6 through 2.7, and in the future we want to
+support Python 3. Avoid using language features added in
+2.7, or features deprecated in Python 3.0. (You can check v3
compatibility using the ``-3`` option of Python2.6.)
-Specifically:
-
-* Don't use the ``with`` statement.
-
-* Don't ``from . import``.
-
-* Don't use ``try/except/finally``, which is not supported in Python2.4,
- use separate nested ``try/except`` and ``try/finally`` blocks.
-
hasattr and getattr
===================
=== modified file 'doc/en/admin-guide/introduction.txt'
--- a/doc/en/admin-guide/introduction.txt 2010-06-02 05:03:31 +0000
+++ b/doc/en/admin-guide/introduction.txt 2012-08-30 21:21:38 +0000
@@ -31,13 +31,12 @@
environments. For the purposes of this document, we will consider Mac OS X as
a type of Unix.
-In general, Bazaar requires only Python_ 2.4 or greater and the cElementTree_
-package (included in Python 2.5 and later) to run. If you would *optionally*
+In general, Bazaar requires only Python_ 2.6 or greater to run.
+If you would *optionally*
like to be able to access branches using SFTP, you need `paramiko and
pycrypto`_.
.. _Python: http://www.python.org/
-.. _cElementTree: http://effbot.org/zone/element-index.htm
.. _paramiko and pycrypto: http://www.lag.net/paramiko/
For maximum performance, Bazaar can make use of compiled versions of some
=== modified file 'doc/en/user-guide/installing_bazaar.txt'
--- a/doc/en/user-guide/installing_bazaar.txt 2010-08-13 19:08:57 +0000
+++ b/doc/en/user-guide/installing_bazaar.txt 2012-08-30 22:45:44 +0000
@@ -33,7 +33,7 @@
If you wish to install Bazaar from scratch rather than using a
pre-built package, the steps are:
- 1. If it is not installed already, install Python 2.4 or later.
+ 1. If it is not installed already, install Python 2.6 or later.
2. Download the ``bazaar-xxx.tar.gz`` file (where xxx is the version
number) from http://wiki.bazaar.canonical.com/Download or from Launchpad
More information about the bazaar-commits
mailing list