From 800de253c9d9fdffcb104d1c6f1b1ccdce7866b0 Mon Sep 17 00:00:00 2001
From: "Duncan McGreggor duncan@canonical.com"
 <Duncan McGreggor duncan@canonical.com@deba9d59-1947-0410-8851-5b62627b2c5b>
Date: Fri, 18 Dec 2009 17:39:38 +0000
Subject: [PATCH] Merged changes from local branch.

---
 ChangeLog                        | 22 ++++++++++++++++++++++
 admin/commit.sh                  |  2 +-
 rtfng/{ertf.py => exceptions.py} |  7 +++++--
 3 files changed, 28 insertions(+), 3 deletions(-)
 rename rtfng/{ertf.py => exceptions.py} (50%)

diff --git a/ChangeLog b/ChangeLog
index ece1ab5..2f706a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,29 @@
+2009.12.18
+
+* Updated the admin script to use the new bzr-svn plugin syntax.
+* Renamed the exceptions module and updated one of the contained classes.
+
 2009.11.18
 
 * Updated TODO.
 
+2009.10.27
+
+* Convert merged_cells to unit tests.
+* Fix test_pictures so that it doesn't save a temporary file.
+* Remove duplicate code in test_pictures.
+* Port picture test.
+* Fix spelling of test_charaters.py to test_characters.py.
+* Get header footer tests ported over and working.
+* Remove debug statements.
+* Write unicode test.
+
+2009.10.22
+
+* Make test_tables pass.
+* Comment out empty test_headerfooter until it's ready.
+* Complain on duplicate test method names in generateReferenceDocs.py.
+
 2008.06.11
 
 * Added Juanjo Conti's patch to support unicode.
diff --git a/admin/commit.sh b/admin/commit.sh
index 2b26f22..17ba72d 100755
--- a/admin/commit.sh
+++ b/admin/commit.sh
@@ -59,7 +59,7 @@ function localCommit {
 
 function pushGoogleCode {
     echo "Pushing to Subversion now ..."
-    bzr svn-push $SVN
+    bzr push $SVN
 }
 
 function pushLaunchpad {
diff --git a/rtfng/ertf.py b/rtfng/exceptions.py
similarity index 50%
rename from rtfng/ertf.py
rename to rtfng/exceptions.py
index eb20fc1..848ce13 100644
--- a/rtfng/ertf.py
+++ b/rtfng/exceptions.py
@@ -5,5 +5,8 @@
 class RTFError(Exception):
     pass
 
-class RTFParseError(RTFError):
-   "Unable to parse RTF data."
+
+class ParseError(RTFError):
+   """
+   Unable to parse the RTF data.
+   """