Switch to unified view

a/Allura/allura/command/base.py b/Allura/allura/command/base.py
...
...
51
            self.setup_globals()
51
            self.setup_globals()
52
            from allura import model
52
            from allura import model
53
            M=model
53
            M=model
54
            ming.configure(**conf)
54
            ming.configure(**conf)
55
            activitystream.configure(**conf)
55
            activitystream.configure(**conf)
56
            pylons.c.user = M.User.anonymous()
56
            pylons.tmpl_context.user = M.User.anonymous()
57
        else:
57
        else:
58
            # Probably being called from another script (websetup, perhaps?)
58
            # Probably being called from another script (websetup, perhaps?)
59
            log = logging.getLogger('allura.command')
59
            log = logging.getLogger('allura.command')
60
            conf = pylons.config
60
            conf = pylons.config
61
        self.tools = pylons.g.entry_points['tool'].values()
61
        self.tools = pylons.app_globals.entry_points['tool'].values()
62
        for ep in iter_entry_points('allura.command_init'):
62
        for ep in iter_entry_points('allura.command_init'):
63
            log.info('Running command_init for %s', ep.name)
63
            log.info('Running command_init for %s', ep.name)
64
            ep.load()(conf)
64
            ep.load()(conf)
65
        log.info('Loaded tools')
65
        log.info('Loaded tools')
66
66
...
...
68
        import allura.lib.app_globals
68
        import allura.lib.app_globals
69
        self.registry.prepare()
69
        self.registry.prepare()
70
        self.registry.register(pylons.c, EmptyClass())
70
        self.registry.register(pylons.c, EmptyClass())
71
        self.registry.register(pylons.g, self.globals)
71
        self.registry.register(pylons.g, self.globals)
72
        self.registry.register(allura.credentials, allura.lib.security.Credentials())
72
        self.registry.register(allura.credentials, allura.lib.security.Credentials())
73
        pylons.c.queued_messages = None
73
        pylons.tmpl_context.queued_messages = None
74
74
75
    def teardown_globals(self):
75
    def teardown_globals(self):
76
        self.registry.cleanup()
76
        self.registry.cleanup()
77
77