← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_nonascii.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/test_nonascii.py
131
131
        self.assertEqual(expected, present)
132
132
 
133
133
    def test_access_normalized(self):
134
 
        # We should always be able to access files created with 
 
134
        # We should always be able to access files created with
135
135
        # normalized filenames
136
136
        # With FAT32 and certain encodings on win32
137
137
        # a_circle_c and a_dots_c actually map to the same file
160
160
                actual = f.read()
161
161
            finally:
162
162
                f.close()
163
 
            self.assertEqual(shouldbe, actual, 
 
163
            self.assertEqual(shouldbe, actual,
164
164
                             'contents of %r is incorrect: %r != %r'
165
165
                             % (path, shouldbe, actual))
166
166