Rev 3523: Tweak chmod bits output for easier debug. in file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/more-ftp/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/more-ftp/

------------------------------------------------------------
revno: 3523
revision-id: v.ladeuil+lp at free.fr-20090317081545-650uqmy2v5j9dy0s
parent: v.ladeuil+lp at free.fr-20090317081400-9tjv65u6f77sfsu0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pyftpdlib
timestamp: Tue 2009-03-17 09:15:45 +0100
message:
  Tweak chmod bits output for easier debug.
  
  * bzrlib/transport/ftp/__init__.py: 
  Fix import order.
  
  * bzrlib/tests/__init__.py:
  (TestCase.assertTransportMode): Output chmod bits in octal.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-02-27 13:26:13 +0000
+++ b/bzrlib/tests/__init__.py	2009-03-17 08:15:45 +0000
@@ -1000,8 +1000,9 @@
             return
         path_stat = transport.stat(path)
         actual_mode = stat.S_IMODE(path_stat.st_mode)
-        self.assertEqual(mode, actual_mode,
-            'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
+        self.assertEqual(oct(mode), oct(actual_mode),
+                         'mode of %r incorrect (%s != %s)'
+                         % (path, oct(mode), oct(actual_mode)))
 
     def assertIsSameRealPath(self, path1, path2):
         """Fail if path1 and path2 points to different files"""

=== modified file 'bzrlib/transport/ftp/__init__.py'
--- a/bzrlib/transport/ftp/__init__.py	2009-03-01 10:02:00 +0000
+++ b/bzrlib/transport/ftp/__init__.py	2009-03-17 08:15:45 +0000
@@ -31,10 +31,10 @@
 import os
 import os.path
 import urlparse
+import random
 import socket
 import stat
 import time
-import random
 from warnings import warn
 
 from bzrlib import (