← Back to branch summary

~maxb/bzr-dbus/test2

« back to all changes in this revision

Viewing changes to hook.py

  • Committer: Robert Collins
  • Date: 2010-02-18 22:45:32 UTC
  • mfrom: (39.1.1 lazy)
  • Revision ID: robertc@robertcollins.net-20100218224532-y35bg4jgq3mywau5
Merge Jelmer's more-lazy patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hook.py
22
22
from bzrlib.branch import Branch
23
23
from bzrlib.smart.server import SmartTCPServer
24
24
 
25
 
import activity
26
 
import dbus
27
 
 
28
 
 
29
25
def install_hooks():
30
26
    """Install the dbus hooks into bzrlib."""
31
27
    Branch.hooks.install_named_hook(
40
36
 
41
37
 
42
38
def get_activity():
 
39
    import activity
 
40
    import dbus
43
41
    try:
44
42
        return activity.Activity()
45
43
    except dbus.DBusException, e: