← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/ftp_server.py
126
126
    def cmd_size(self, line):
127
127
        """Return the size of a file
128
128
 
129
 
        This is overloaded to help the test suite determine if the 
 
129
        This is overloaded to help the test suite determine if the
130
130
        target is a directory.
131
131
        """
132
132
        filename = line[1]
136
136
            else:
137
137
                self.respond('550 "%s" is not a file' % (filename,))
138
138
        else:
139
 
            self.respond('213 %d' 
 
139
            self.respond('213 %d'
140
140
                % (self.filesystem.stat(filename)[stat.ST_SIZE]),)
141
141
 
142
142
    def cmd_mkd(self, line):