← Back to branch summary

~gz/brz/knit_load_py3

« back to all changes in this revision

Viewing changes to breezy/tests/test_upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-17 11:15:04 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7003.
  • Revision ID: jelmer@jelmer.uk-20180617111504-i2eqvqbtfj5bp0t3
s/file/open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upstream_import.py
109
109
            os.mkdir(prefix + 'junk')
110
110
            archive_file.add(prefix + 'junk')
111
111
 
112
 
            f = file(prefix + 'README', 'wb')
113
 
            f.write('What?')
114
 
            f.close()
 
112
            with open(prefix + 'README', 'wb') as f:
 
113
                f.write(b'What?')
115
114
            archive_file.add(prefix + 'README')
116
115
 
117
 
            f = file(prefix + 'FEEDME', 'wb')
118
 
            f.write('Hungry!!')
119
 
            f.close()
 
116
            with open(prefix + 'FEEDME', 'wb') as f:
 
117
                f.write(b'Hungry!!')
120
118
            archive_file.add(prefix + 'FEEDME')
121
119
 
122
120
            archive_file.close()
142
140
            os.mkdir(prefix + 'junk')
143
141
            archive_file.add(prefix + 'junk')
144
142
 
145
 
            with file(prefix + 'README', 'wb') as f:
146
 
                f.write('Now?')
 
143
            with open(prefix + 'README', 'wb') as f:
 
144
                f.write(b'Now?')
147
145
            archive_file.add(prefix + 'README')
148
146
 
149
 
            with file(prefix + 'README', 'wb') as f:
150
 
                f.write('Wow?')
 
147
            with open(prefix + 'README', 'wb') as f:
 
148
                f.write(b'Wow?')
151
149
            # Add a second entry for README with different contents.
152
150
            archive_file.add(prefix + 'README')
153
151
            archive_file.close()
167
165
            os.mkdir('project-0.2')
168
166
            tar_file.add('project-0.2')
169
167
 
170
 
            with file('project-0.1/README', 'wb') as f:
171
 
                f.write('What?')
 
168
            with open('project-0.1/README', 'wb') as f:
 
169
                f.write(b'What?')
172
170
            tar_file.add('project-0.1/README')
173
171
        rmtree('project-0.1')
174
172
        result.seek(0)
233
231
            self.assertTrue(os.path.isfile(tree.abspath('README')))
234
232
            self.assertEqual(tree.stored_kind('README'), 'file')
235
233
            self.assertEqual(tree.stored_kind('FEEDME'), 'file')
236
 
            with file(tree.abspath('junk/food'), 'wb') as f:
237
 
                f.write('I like food\n')
 
234
            with open(tree.abspath('junk/food'), 'wb') as f:
 
235
                f.write(b'I like food\n')
238
236
 
239
237
            with warnings.catch_warnings():
240
238
                warnings.simplefilter('ignore')