← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lazy_import.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/lazy_import.py
149
149
 
150
150
        :param scope: The scope that objects should be imported into.
151
151
            Typically this is globals()
152
 
        :param name: The variable name. Often this is the same as the 
 
152
        :param name: The variable name. Often this is the same as the
153
153
            module_path. 'bzrlib'
154
154
        :param module_path: A list for the fully specified module path
155
155
            ['bzrlib', 'foo', 'bar']
157
157
            None, indicating the module is being imported.
158
158
        :param children: Children entries to be imported later.
159
159
            This should be a map of children specifications.
160
 
            {'foo':(['bzrlib', 'foo'], None, 
 
160
            {'foo':(['bzrlib', 'foo'], None,
161
161
                {'bar':(['bzrlib', 'foo', 'bar'], None {})})
162
162
            }
163
163
        Examples: