Rev 114: Fix failing tests. in file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/xmloutput/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/xmloutput/

------------------------------------------------------------
revno: 114
revision-id: v.ladeuil+lp at free.fr-20081210164128-eax9fz142raslpk9
parent: guillo.gonzo at gmail.com-20081122194357-kq8imox1bvzusmlv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: xmloutput
timestamp: Wed 2008-12-10 17:41:28 +0100
message:
  Fix failing tests.
  
  * logxml.py:
  (XMLLogFormatter.__init__): Use args and kwargs to be more
  resistant against API evolution.
  
  * __init__.py:
  (null_option, cmd_xmlversion, cmd_start_xmlrpc, cmd_stop_xmlrpc):
  	
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-11-20 04:10:13 +0000
+++ b/__init__.py	2008-12-10 16:41:28 +0000
@@ -56,7 +56,7 @@
 version_info = (0, 8, 1)
 plugin_name = 'xmloutput'
 
-null_option = Option('null', help='Write an ascii NUL (\\0) as the final char')
+null_option = Option('null', help='Write an ascii NUL (\\0) as the final char.')
 
 
 class cmd_xmlstatus(commands.Command):
@@ -291,7 +291,7 @@
     """Show version of bzr."""
     hidden = True
     encoding_type = 'replace'
-    takes_options = [Option("short", help="Only print the version number"),
+    takes_options = [Option("short", help="Only print the version number."),
                     null_option]
 
     @display_command
@@ -403,9 +403,9 @@
     hidden=True
     takes_options = [
             Option('hostname', argname='HOSTNAME', type=str,
-                help='use the specified hostname, defaults to localhost'),
+                help='Use the specified hostname, defaults to localhost.'),
             Option('port', argname='PORT', type=int,
-                help='use the specified port, defaults to 11111'),
+                help='Use the specified port, defaults to 11111.'),
             'verbose',
             ]
 
@@ -433,9 +433,9 @@
     hidden=True
     takes_options = [
             Option('hostname', argname='HOSTNAME', type=str,
-                help='use the specified hostname, defaults to localhost'),
+                help='Use the specified hostname, defaults to localhost.'),
             Option('port', argname='PORT', type=int,
-                help='use the specified port, defaults to 11111'),
+                help='Use the specified port, defaults to 11111.'),
             'verbose',
             ]
 

=== modified file 'logxml.py'
--- a/logxml.py	2008-11-20 04:03:25 +0000
+++ b/logxml.py	2008-12-10 16:41:28 +0000
@@ -20,9 +20,8 @@
     supports_delta = True
     supports_tags = True
 
-    def __init__(self, to_file, show_ids=False, show_timezone='original'):
-        super(XMLLogFormatter, self).__init__(to_file=to_file,
-                               show_ids=show_ids, show_timezone=show_timezone)
+    def __init__(self, *args, **kwargs):
+        super(XMLLogFormatter, self).__init__(*args, **kwargs)
         self.log_count = 0
         self.start_with_merge = False
         self.nested_merge_count = 0