Rev 3257: Update ConfigObj version (Matt Nordhoff) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sat Mar 8 23:10:48 GMT 2008


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3257
revision-id:pqm at pqm.ubuntu.com-20080308231040-by6td3eegfa0s21i
parent: pqm at pqm.ubuntu.com-20080307231150-h9ct4c51ekdiexbs
parent: jelmer at samba.org-20080308213325-0tgrjt566q32na2w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-03-08 23:10:40 +0000
message:
  Update ConfigObj version (Matt Nordhoff)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
  bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
  bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
    ------------------------------------------------------------
    revno: 3239.1.4
    revision-id:jelmer at samba.org-20080308213325-0tgrjt566q32na2w
    parent: mnordhoff at mattnordhoff.com-20080227213857-t73c1shhgdhawh6x
    parent: pqm at pqm.ubuntu.com-20080307231150-h9ct4c51ekdiexbs
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: configobj-4.5.2
    timestamp: Sat 2008-03-08 22:33:25 +0100
    message:
      Merge bzr.dev.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
      bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
      bzrlib/deprecated_graph.py     graph.py-20050905070950-b47dce53236c5e48
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
      bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
      bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
      bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
      bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
      bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
      doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
    ------------------------------------------------------------
    revno: 3239.1.3
    revision-id:mnordhoff at mattnordhoff.com-20080227213857-t73c1shhgdhawh6x
    parent: mnordhoff at mattnordhoff.com-20080227213616-3dm9apo8piay0z71
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: configobj-4.5.2
    timestamp: Wed 2008-02-27 21:38:57 +0000
    message:
      NEWS
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3239.1.2
    revision-id:mnordhoff at mattnordhoff.com-20080227213616-3dm9apo8piay0z71
    parent: mnordhoff at mattnordhoff.com-20080227213430-gr5acc9b1v87sr81
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: configobj-4.5.2
    timestamp: Wed 2008-02-27 21:36:16 +0000
    message:
      Restore hasattr -> getattr
    modified:
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
    ------------------------------------------------------------
    revno: 3239.1.1
    revision-id:mnordhoff at mattnordhoff.com-20080227213430-gr5acc9b1v87sr81
    parent: pqm at pqm.ubuntu.com-20080227195331-0nc0vzgjka1ornoe
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: configobj-4.5.2
    timestamp: Wed 2008-02-27 21:34:30 +0000
    message:
      Upgrade ConfigObj to 4.5.2.
      
      There were no changes to configobj.py, just docs and validate.py.
    modified:
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
      bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
      bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
=== modified file 'NEWS'
--- a/NEWS	2008-03-07 21:35:38 +0000
+++ b/NEWS	2008-03-08 21:33:25 +0000
@@ -63,7 +63,7 @@
     * Redirecting the output from ``bzr merge`` (when the remembered
       location is used) now works. (John Arbash Meinel)
 
-    * Upgrade bundled ConfigObj to version 4.5.1, which properly quotes #
+    * Upgrade bundled ConfigObj to version 4.5.2, which properly quotes #
       signs, among other small improvements. (Matt Nordhoff, #86838)
 
     * Use correct indices when emitting LCA conflicts.  This fixes IndexError

=== modified file 'bzrlib/util/configobj/configobj.py'
--- a/bzrlib/util/configobj/configobj.py	2008-02-27 07:12:26 +0000
+++ b/bzrlib/util/configobj/configobj.py	2008-02-27 21:36:16 +0000
@@ -117,7 +117,7 @@
     True, False = 1, 0
 
 
-__version__ = '4.5.1'
+__version__ = '4.5.2'
 
 __revision__ = '$Id: configobj.py 156 2006-01-31 14:57:08Z fuzzyman $'
 

=== modified file 'bzrlib/util/configobj/docs/configobj.txt'
--- a/bzrlib/util/configobj/docs/configobj.txt	2008-02-08 19:09:45 +0000
+++ b/bzrlib/util/configobj/docs/configobj.txt	2008-02-27 21:34:30 +0000
@@ -7,8 +7,8 @@
 ----------------------------------------
 
 :Authors: Michael Foord, Nicola Larosa
-:Version: ConfigObj 4.5.1
-:Date: 2008/02/05
+:Version: ConfigObj 4.5.2
+:Date: 2008/02/24
 :Homepage: `ConfigObj Homepage`_
 :Sourceforge: Sourceforge_
 :Development: `SVN Repository`_
@@ -47,11 +47,9 @@
     - repeated sections
     - and allowing default values
 
-* All comments in the file are preserved
-* The order of keys/sections is preserved
-* No external dependencies
+* When writing out config files, ConfigObj preserves all comments and the order of members and sections
+* Many useful methods and options for working with configuration files (like the 'reload' method)
 * Full Unicode support
-* A powerful ``unrepr`` mode for storing basic datatypes
 
 
 For support and bug reports please use the ConfigObj `Mailing List`_.
@@ -60,7 +58,7 @@
 Downloading
 ===========
 
-The current version is **4.5.1**, dated 5th February 2008. ConfigObj 4 is
+The current version is **4.5.2**, dated 24th February 2008. ConfigObj 4 is
 now stable. We still expect to pick up a few bugs along the way though [#]_.
 {sm;:-)}
 
@@ -108,7 +106,7 @@
 from the `Subversion Repository <http://svn.pythonutils.python-hosting.com/trunk/pythonutils/>`_.
 
 .. _configobj.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj.py
-.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj-4.5.1.zip
+.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj-4.5.2.zip
 .. _validate.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=validate.py
 .. _this document:
 .. _configobj homepage: http://www.voidspace.org.uk/python/configobj.html
@@ -138,11 +136,15 @@
    {acro;PIM;Personal Information Manager}, being developed by the 
    `OSAFoundation <http://www.osafoundation.org/>`_.
  
+* `matplotlib <http://matplotlib.sourceforge.net/>`_
+
+	A 2D plotting library.
+
 * `IPython <http://ipython.scipy.org/moin/>`_
 
     IPython is an enhanced interactive Python shell. IPython uses ConfigObj in a module called 'TConfig' that combines it with enthought `Traits <http://code.enthought.com/traits/>`_: `tconfig <http://ipython.scipy.org/ipython/ipython/browser/ipython/branches/saw/sandbox/tconfig>`_.
     
-* ` Elisa - the Fluendo Mediacenter <http://elisa.fluendo.com/>`_    
+* `Elisa - the Fluendo Mediacenter <http://elisa.fluendo.com/>`_    
     
     Elisa is an open source cross-platform media center solution designed to be simple for people not particularly familiar with computers.
 
@@ -2338,6 +2340,13 @@
 From version 4 it lists all releases and changes.
 
 
+2008/02/05 - Version 4.5.2
+--------------------------
+
+Distribution updated to include version 0.3.2 of validate_. This means that
+``None`` as a default value win configspecs works.
+
+
 2008/02/05 - Version 4.5.1
 --------------------------
 

=== modified file 'bzrlib/util/configobj/docs/validate.txt'
--- a/bzrlib/util/configobj/docs/validate.txt	2008-02-08 19:09:45 +0000
+++ b/bzrlib/util/configobj/docs/validate.txt	2008-02-27 21:34:30 +0000
@@ -8,8 +8,8 @@
 
 
 :Authors: `Michael Foord`_, `Nicola Larosa`_, `Mark Andrews`_
-:Version: Validate 0.3.1
-:Date: 2008/02/05
+:Version: Validate 0.3.2
+:Date: 2008/02/24
 :Homepage: `Validate Homepage`_
 :License: `BSD License`_
 :Support: `Mailing List`_
@@ -68,7 +68,7 @@
 Downloading
 ===========
 
-The current version is **0.3.1**, dated 5th February 2008. 
+The current version is **0.3.2**, dated 24th February 2008. 
 
 You can get obtain validate in the following ways :
 
@@ -103,7 +103,7 @@
 Python Projects`_.
 
 .. _configobj.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj.py
-.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj-4.5.1.zip
+.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj-4.5.2.zip
 .. _validate.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=validate.py
 .. _Subversion Repository: http://svn.pythonutils.python-hosting.com/trunk/pythonutils/
 .. _Sourceforge: http://sourceforge.net/projects/configobj
@@ -288,7 +288,7 @@
 
     {-coloring}
 
-``vtor.functions``is just a dictionary that maps names to functions, so we
+``vtor.functions`` is just a dictionary that maps names to functions, so we
 could also have called ``vtor.functions.update(fdict)``.
 
 
@@ -596,8 +596,7 @@
 ====
 
 * A regex check function ?
-* A timestamp check function ? (Using the ``parse`` function from ``DateUtil``).
-* Allow triple quotes ? (getting a bit heavy for a regex)
+* A timestamp check function ? (Using the ``parse`` function from ``DateUtil`` perhaps).
 
 
 ISSUES
@@ -615,6 +614,11 @@
 CHANGELOG
 =========
 
+2008/02/24 - Version 0.3.2
+--------------------------
+
+BUGFIX: Handling of None as default value fixed.
+
 
 2008/02/05 - Version 0.3.1
 --------------------------




More information about the bazaar-commits mailing list