From 9205c5c0547f15c6241c0646c21b27a94910bcc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 25 Jun 2014 15:23:27 +0200
Subject: [PATCH] core: fix imports

---
 core-modules/02QubesTemplateHVm.py | 2 +-
 core/notify.py                     | 4 ++--
 core/qubesutils.py                 | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core-modules/02QubesTemplateHVm.py b/core-modules/02QubesTemplateHVm.py
index b4a07460..27fa076f 100644
--- a/core-modules/02QubesTemplateHVm.py
+++ b/core-modules/02QubesTemplateHVm.py
@@ -29,7 +29,7 @@ import stat
 import sys
 import re
 
-from qubes.qubes import QubesHVm,register_qubes_vm_class,xs,xc,dry_run
+from qubes.qubes import QubesHVm,register_qubes_vm_class,dry_run
 from qubes.qubes import QubesException,QubesVmCollection
 from qubes.qubes import system_path,defaults
 
diff --git a/core/notify.py b/core/notify.py
index f99c102d..5ca75f3f 100644
--- a/core/notify.py
+++ b/core/notify.py
@@ -49,9 +49,9 @@ def tray_notify_error(msg, timeout = 3000):
                              timeout, dbus_interface="org.freedesktop.Notifications")
 
 def notify_error_qubes_manager(name, message):
+    import dbus
     global system_bus
     if system_bus is None:
-        import dbus
         system_bus = dbus.SystemBus()
 
     try:
@@ -63,9 +63,9 @@ def notify_error_qubes_manager(name, message):
         pass
 
 def clear_error_qubes_manager(name, message):
+    import dbus
     global system_bus
     if system_bus is None:
-        import dbus
         system_bus = dbus.SystemBus()
 
     try:
diff --git a/core/qubesutils.py b/core/qubesutils.py
index a78826d4..0ca90e4d 100644
--- a/core/qubesutils.py
+++ b/core/qubesutils.py
@@ -22,8 +22,7 @@
 #
 #
 
-from qubes import QubesVm,QubesException,QubesVmCollection
-from qubes import QubesVmClasses
+from qubes import QubesException
 from qubes import vmm
 from qubes import system_path,vm_files
 import sys