/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/lazy_import.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/lazy_import.py
85
85
            obj = factory(self, scope, name)
86
86
            if obj is self:
87
87
                raise errors.IllegalUseOfScopeReplacer(name, msg="Object tried"
88
 
                    " to replace itself, check it's not using its own scope.")
 
88
                                                       " to replace itself, check it's not using its own scope.")
89
89
 
90
90
            # Check if another thread has jumped in while obj was generated.
91
91
            real_obj = object.__getattribute__(self, '_real_obj')
165
165
        :param children: Children entries to be imported later.
166
166
            This should be a map of children specifications.
167
167
            ::
168
 
            
 
168
 
169
169
                {'foo':(['breezy', 'foo'], None,
170
170
                    {'bar':(['breezy', 'foo', 'bar'], None {})})
171
171
                }
261
261
                self._convert_from_str(line)
262
262
            else:
263
263
                raise errors.InvalidImportLine(line,
264
 
                    "doesn't start with 'import ' or 'from '")
 
264
                                               "doesn't start with 'import ' or 'from '")
265
265
 
266
266
    def _convert_import_str(self, import_str):
267
267
        """This converts a import string into an import map.
356
356
        """
357
357
        out = []
358
358
        cur = None
359
 
        continuing = False
360
359
 
361
360
        for line in text.split('\n'):
362
361
            line = line.strip()