/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_source.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-24 21:11:49 UTC
  • mto: This revision was merged to the branch mainline in revision 7054.
  • Revision ID: jelmer@jelmer.uk-20180724211149-dpzutljx0up50ian
Fix a couple more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
 
146
146
    def get_source_file_contents(self, extensions=None):
147
147
        for fname in self.get_source_files(extensions=extensions):
148
 
            f = open(fname, 'rb')
149
 
            try:
150
 
                text = f.read()
151
 
            finally:
152
 
                f.close()
153
 
            yield fname, text
 
148
            with open(fname, 'r') as f:
 
149
                yield fname, f.read()
154
150
 
155
151
    def is_our_code(self, fname):
156
152
        """True if it's a "real" part of breezy rather than external code"""
350
346
                continue
351
347
            if not assert_re.search(text):
352
348
                continue
353
 
            ast = parser.ast2tuple(parser.suite(text))
354
 
            if search(ast):
 
349
            st = parser.suite(text)
 
350
            code = parser.st2tuple(st)
 
351
            if search(code):
355
352
                badfiles.append(fname)
356
353
        if badfiles:
357
354
            self.fail(