Browse files

Merged changes from local branch.

  • Loading branch information...
1 parent 7374b2e commit 800de253c9d9fdffcb104d1c6f1b1ccdce7866b0 Duncan McGreggor duncan@canonical.com committed Dec 18, 2009
Showing with 28 additions and 3 deletions.
  1. +22 −0 ChangeLog
  2. +1 −1 admin/commit.sh
  3. +5 −2 rtfng/{ertf.py → exceptions.py}
View
22 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.
View
2 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 {
View
7 rtfng/ertf.py → 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.
+ """

0 comments on commit 800de25

Please sign in to comment.