[MERGE]Change "print >> outfile" to "outfile.write".

John Arbash Meinel john at arbash-meinel.com
Tue Oct 16 18:07:16 BST 2007


John Arbash Meinel has voted tweak.
Status is now: Semi-approved
Comment:
Obviously the test suite needs to pass before this can be merged. But I 
really do like the overall effort.

If the only change is to do:

f.write(FORMAT_1)

We can certainly do that when we merge, rather than requiring you to 
resubmit.


You don't need the trailing '\' if you are inside parenthesis:
-            print >> output_to, \
-                  ("Binary files %s and %s differ" % 
label_pair).encode('utf8')
+            output_to.write(\
+                  ("Binary files %s and %s differ\n" % 
label_pair).encode('utf8'))

should be

+            output_to.write(
+                  ("Binary files %s and %s differ\n" % 
label_pair).encode('utf8'))


These changes:
-            print >>to_file,  '      revision-id:', 
revision.rev.revision_id
+            to_file.write('      revision-id:' + 
revision.rev.revision_id + '\n')


Are probably easier expressed as:
-            print >>to_file,  '      revision-id:', 
revision.rev.revision_id
+            to_file.write('      revision-id:%s\n' % 
(revision.rev.revision_id,))


Also here:
=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py    2007-10-15 09:04:41 +0000
+++ bzrlib/tests/__init__.py    2007-10-16 16:02:01 +0000
@@ -354,12 +354,15 @@
              self.stream.write("%s: " % flavour)
              self.stream.writeln(self.getDescription(test))
              if getattr(test, '_get_log', None) is not None:
-                print >>self.stream
-                print >>self.stream, \
-                        ('vvvv[log from %s]' % test.id()).ljust(78,'-')
-                print >>self.stream, test._get_log()
-                print >>self.stream, \
-                        ('^^^^[log from %s]' % test.id()).ljust(78,'-')
+                self.stream.write('\n')
+                self.stream.write(\
+                        ('vvvv[log from %s]' % 
test.id()).ljust(78,'-'))
+                self.stream.write('\n')
+                self.stream.write(test._get_log())
+                self.stream.write('\n')
+                self.stream.write(\
+                        ('^^^^[log from %s]' % 
test.id()).ljust(78,'-'))
+                self.stream.write('\n')
              self.stream.writeln(self.separator2)
              self.stream.writeln("%s" % err)

You don't need trailing '\'.


I would certainly change this:
+    sys.stderr.write("bzr: error: cannot find a suitable python 
interpreter\n")
+    sys.stderr.write("  (need %d.%d or later)" % NEED_VERS)
+    sys.stderr.write('\n')

to sys.stderr.write("  (need %d.%d or later)\n" % (NEED_VERS,))

(You don't have to do the tuple thing, but I've defaulted myself to 
always doing it for safety.)

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C4714E981.6010006%40latte.ca%3E



More information about the bazaar mailing list