diff --git a/qubes/__init__.py b/qubes/__init__.py index c17d11c3..5a85543f 100644 --- a/qubes/__init__.py +++ b/qubes/__init__.py @@ -54,7 +54,6 @@ import __builtin__ import docutils.core import docutils.io import lxml.etree -import xml.parsers.expat import qubes.ext diff --git a/qubes/dochelpers.py b/qubes/dochelpers.py index f055daf0..39ad9663 100644 --- a/qubes/dochelpers.py +++ b/qubes/dochelpers.py @@ -31,7 +31,6 @@ particularly our custom Sphinx extension. import csv import posixpath import re -import sys import urllib2 import docutils diff --git a/qubes/plugins.py b/qubes/plugins.py index d65c5c08..438a7436 100644 --- a/qubes/plugins.py +++ b/qubes/plugins.py @@ -28,9 +28,7 @@ Qubes uses two types of plugins: virtual machines and extensions. ''' import imp -import inspect import os -import sys class Plugin(type): '''Base metaclass for plugins''' diff --git a/qubes/storage/xen.py b/qubes/storage/xen.py index 36390e8c..8e83c61c 100644 --- a/qubes/storage/xen.py +++ b/qubes/storage/xen.py @@ -28,8 +28,8 @@ from __future__ import absolute_import import os import os.path +import re import subprocess -import sys import lxml.etree diff --git a/qubes/tests/events.py b/qubes/tests/events.py index 9bee5b6c..4e5ff9fd 100644 --- a/qubes/tests/events.py +++ b/qubes/tests/events.py @@ -22,11 +22,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -import sys -import unittest - import qubes.events - import qubes.tests class TC_00_Emitter(qubes.tests.QubesTestCase): diff --git a/qubes/tests/init.py b/qubes/tests/init.py index 921b3cbb..f0223883 100644 --- a/qubes/tests/init.py +++ b/qubes/tests/init.py @@ -23,7 +23,6 @@ # import os -import sys import unittest import lxml.etree diff --git a/qubes/tests/vm/adminvm.py b/qubes/tests/vm/adminvm.py index 86219837..02e8dd57 100644 --- a/qubes/tests/vm/adminvm.py +++ b/qubes/tests/vm/adminvm.py @@ -22,7 +22,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -import sys import unittest import qubes diff --git a/qubes/tests/vm/init.py b/qubes/tests/vm/init.py index 1a6e077c..ea442b65 100644 --- a/qubes/tests/vm/init.py +++ b/qubes/tests/vm/init.py @@ -22,9 +22,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -import sys -import unittest - import lxml.etree import qubes diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py index bcdd0b22..30ed92fa 100644 --- a/qubes/tests/vm/qubesvm.py +++ b/qubes/tests/vm/qubesvm.py @@ -22,7 +22,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -import sys import unittest import qubes diff --git a/qubes/utils.py b/qubes/utils.py index bb448a5a..36ca1ca3 100644 --- a/qubes/utils.py +++ b/qubes/utils.py @@ -24,6 +24,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +import os +import re +import subprocess + def get_timezone(): # fc18 diff --git a/qubes/vm/__init__.py b/qubes/vm/__init__.py index 5a8d9ccb..5d33101e 100644 --- a/qubes/vm/__init__.py +++ b/qubes/vm/__init__.py @@ -30,8 +30,13 @@ import ast import collections +import datetime import functools +import os +import re +import subprocess import sys +import xml.parsers.expat import lxml.etree diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index e5cc955a..b4c05302 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -34,9 +34,7 @@ import subprocess import sys import time import uuid -import xml.parsers.expat import libvirt -import warnings import qubes import qubes.config