Merge lp:~cr3/ubuntu/quantal/checkbox/0.14 into lp:ubuntu/quantal/checkbox

[Marc Tardif]

=== modified file 'backend'
--- backend	2011-08-10 21:09:56 +0000
+++ backend	2012-06-23 00:59:17 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import sys
@@ -19,9 +19,16 @@
     if len(args) < 2:
         parser.error("Missing INPUT and OUTPUT")
 
+    # Set PATH
     if options.path:
         os.environ["PATH"] = options.path
 
+    # Set PYTHONPATH
+    pythonpath = sys.path[0]
+    if "PYTHONPATH" in os.environ:
+        pythonpath = ":".join([pythonpath, os.environ["PYTHONPATH"]])
+    os.environ["PYTHONPATH"] = pythonpath
+
     reader = FifoReader(args[0])
     writer = FifoWriter(args[1])
 
@@ -36,12 +43,16 @@
             if isinstance(message, dict) and "command" in message:
                 job = Job(message["command"], message.get("environ"),
                     message.get("timeout"))
-                result = job.execute()
+                status, data, duration = job.execute()
+                try:
+                    data = data.decode("utf-8")
+                except UnicodeDecodeError:
+                    status, data, duration = (FAIL, "Decode error", 0,)
             else:
-                result = (FAIL, "", 0,)
+                status, data, duration = (FAIL, "", 0,)
 
-            writer.write_object(result)
-        except IOError, e:
+            writer.write_object((status, data, duration,))
+        except IOError:
             break
 
     return 0
 
=== modified file 'bin/checkbox-cli'
--- bin/checkbox-cli	2012-02-10 11:19:05 +0000
+++ bin/checkbox-cli	2012-06-23 00:59:17 +0000
@@ -15,4 +15,4 @@
     fi
 fi
 
-python $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'bin/checkbox-gtk'
--- bin/checkbox-gtk	2012-02-10 11:19:05 +0000
+++ bin/checkbox-gtk	2012-06-23 00:59:17 +0000
@@ -15,4 +15,4 @@
     fi
 fi
 
-python $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'bin/checkbox-qt'
--- bin/checkbox-qt	2012-03-21 02:22:11 +0000
+++ bin/checkbox-qt	2012-06-23 00:59:17 +0000
@@ -23,4 +23,4 @@
     (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
 fi
 
-python $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'bin/checkbox-urwid'
--- bin/checkbox-urwid	2012-02-10 11:19:05 +0000
+++ bin/checkbox-urwid	2012-06-23 00:59:17 +0000
@@ -15,4 +15,4 @@
     fi
 fi
 
-python $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'checkbox/application.py'
--- checkbox/application.py	2012-03-21 02:22:11 +0000
+++ checkbox/application.py	2012-06-23 00:59:17 +0000
@@ -35,7 +35,7 @@
 from checkbox.reactor import Reactor
 
 
-class Application(object):
+class Application:
 
     reactor_factory = Reactor
 
@@ -55,7 +55,7 @@
             raise
 
 
-class ApplicationManager(object):
+class ApplicationManager:
 
     application_factory = Application
 
@@ -130,7 +130,7 @@
 
         # Check options
         if options.version:
-            print config.get_defaults().version
+            print(config.get_defaults().version)
             sys.exit(0)
 
         return self.application_factory(config)
 
=== modified file 'checkbox/arguments.py'
--- checkbox/arguments.py	2009-08-19 15:36:05 +0000
+++ checkbox/arguments.py	2012-06-23 00:59:17 +0000
@@ -21,7 +21,7 @@
 from checkbox.lib.decorator import merge_function_metadata
 
 
-class ArgumentReplacer(object):
+class ArgumentReplacer:
     """A decorator helper that filters arguments to be passed to a function.
 
     Create one with the original function and a function to replace
 
=== modified file 'checkbox/attribute.py'
--- checkbox/attribute.py	2009-01-20 18:55:20 +0000
+++ checkbox/attribute.py	2012-06-23 00:59:17 +0000
@@ -19,7 +19,7 @@
 from checkbox.variables import Variable
 
 
-class Attribute(object):
+class Attribute:
 
     def __init__(self, name, cls, variable_factory=None):
         self.name = name
 
=== modified file 'checkbox/component.py'
--- checkbox/component.py	2010-03-09 16:58:36 +0000
+++ checkbox/component.py	2012-06-23 00:59:17 +0000
@@ -29,7 +29,7 @@
 from checkbox.variables import get_variables
 
 
-class ComponentSection(object):
+class ComponentSection:
     """
     Component section which is essentially a container of modules. These
     map to the modules referenced in the configuration passed as argument
@@ -99,7 +99,7 @@
             name, self.name)
 
         if not self.has_module(name):
-            raise Exception, "No such such module: %s" % name
+            raise Exception("No such such module: %s" % name)
 
         filenames = itertools.chain(*[path_expand_recursive(m)
             for m in self.modules])
@@ -109,10 +109,10 @@
                 basename = basename.replace(".py", "")
                 if basename == name:
                     globals = {}
-                    exec open(filename) in globals
+                    exec(open(filename).read(), globals)
                     if "factory" not in globals:
-                        raise Exception, "Variable 'factory' not found in: %s" \
-                            % filename
+                        raise Exception("Variable 'factory' not found in: %s" \
+                            % filename)
 
                     module = globals["factory"]()
                     module.__module__ = name
@@ -122,14 +122,14 @@
 
                     # Set configuration values
                     variables = get_variables(module)
-                    environ = dict([(k.lower(), v) for k, v in os.environ.iteritems()])
-                    for attribute, variable in variables.iteritems():
+                    environ = dict([(k.lower(), v) for k, v in os.environ.items()])
+                    for attribute, variable in variables.items():
                         if config and attribute.name in config:
                             value = config.get(attribute.name)
                             variable.set(value)
                         else:
                             value = variable.get()
-                            if isinstance(value, basestring):
+                            if isinstance(value, str):
                                 value = value % environ
                                 variable.set(value)
                             elif isinstance(value, list):
@@ -137,16 +137,16 @@
                                 variable.set(value)
 
                     # Check required attributes
-                    for attribute, variable in variables.iteritems():
+                    for attribute, variable in variables.items():
                         value = variable.get()
                         if value is None and variable._required:
-                            raise Exception, "Configuration '%s' missing " \
+                            raise Exception("Configuration '%s' missing " \
                                 "required attribute: %s" \
-                                % (config_name, attribute.name)
+                                % (config_name, attribute.name))
 
                     return module
 
-        raise Exception, "Failed to find module '%s' in: %s" % (name, filenames)
+        raise Exception("Failed to find module '%s' in: %s" % (name, filenames))
 
     def load_modules(self):
         """
@@ -160,7 +160,7 @@
         return modules
 
 
-class ComponentManager(object):
+class ComponentManager:
     """
     Component manager which is essentially a container of sections.
     """
 
=== modified file 'checkbox/contrib/REThread.py'
--- checkbox/contrib/REThread.py	2009-01-20 16:46:15 +0000
+++ checkbox/contrib/REThread.py	2012-06-23 00:59:17 +0000
@@ -60,7 +60,7 @@
         Does nothing if no exception was caught.'''
 
         if self._exception:
-            raise self._exception[0], self._exception[1], self._exception[2]
+            raise self._exception[0](self._exception[1]).with_traceback(self._exception[2])
 
 #
 # Unit test
 
=== modified file 'checkbox/contrib/bpickle.py'
--- checkbox/contrib/bpickle.py	2010-03-09 16:58:36 +0000
+++ checkbox/contrib/bpickle.py	2012-06-23 00:59:17 +0000
@@ -39,129 +39,150 @@
 
     type_names = [type(obj)]
     for type_name in type_names:
-        if _dt.has_key(type_name):
+        if type_name in _dt:
             return _dt[type_name](obj)
 
         type_names.extend(type_name.__bases__)
 
-    raise ValueError, "Unsupported type: %s" % type(obj)
+    raise ValueError("Unsupported type: %s" % type(obj))
 
 
 def loads(str, _lt=loads_table):
     if not str:
-        raise ValueError, "Can't load empty string"
+        raise ValueError("Can't load empty string")
     try:
         return _lt[str[0]](str, 0)[0]
-    except KeyError, e:
-        raise ValueError, "Unknown type character: %s" % e
+    except KeyError as e:
+        raise ValueError("Unknown type character: %s" % e)
     except IndexError:
-        raise ValueError, "Corrupted data"
+        raise ValueError("Corrupted data")
+
 
 def dumps_bool(obj):
-    return "b%d" % int(obj)
+    return ("b%d" % int(obj)).encode("ascii")
+
 
 def dumps_int(obj):
-    return "i%s;" % obj
+    return ("i%s;" % obj).encode("ascii")
+
 
 def dumps_float(obj):
-    return "f%r;" % obj
+    return ("f%r;" % obj).encode("ascii")
+
+
+def dumps_bytes(obj):
+    return ("c%s:" % len(obj)).encode("ascii") + obj
+
 
 def dumps_str(obj):
-    return "s%s:%s" % (len(obj), obj)
-
-def dumps_unicode(obj):
     obj = obj.encode("utf-8")
-    return "u%s:%s" % (len(obj), obj)
+    return ("s%s:" % len(obj)).encode("ascii") + obj
+
 
 def dumps_list(obj, _dt=None):
-    return "l%s;" % "".join([dumps(val, _dt) for val in obj])
+    return b"l" + b"".join([dumps(val, _dt) for val in obj]) + b";"
+
 
 def dumps_tuple(obj, _dt=None):
-    return "t%s;" % "".join([dumps(val, _dt) for val in obj])
+    return b"t" + b"".join([dumps(val, _dt) for val in obj]) + b";"
+
 
 def dumps_dict(obj, _dt=None):
     res = []
-    keys = sorted(obj.iterkeys())
+    keys = sorted(obj.keys())
     append = res.append
     for key in keys:
         val = obj[key]
         append(dumps(key, _dt))
         append(dumps(val, _dt))
-    return "d%s;" % "".join(res)
+    return b"d" + b"".join(res) + b";"
+
 
 def dumps_none(obj):
-    return "n"
+    return b"n"
+
 
 def loads_bool(str, pos):
-    return bool(int(str[pos+1])), pos+2
+    return bool(int(chr(str[pos + 1]))), pos + 2
+
 
 def loads_int(str, pos):
-    endpos = str.index(";", pos)
-    return int(str[pos+1:endpos]), endpos+1
+    endpos = str.index(b";", pos)
+    return int(str[pos + 1:endpos]), endpos + 1
+
 
 def loads_float(str, pos):
-    endpos = str.index(";", pos)
-    return float(str[pos+1:endpos]), endpos+1
+    endpos = str.index(b";", pos)
+    return float(str[pos + 1:endpos]), endpos + 1
+
+
+def loads_bytes(str, pos):
+    startpos = str.index(b":", pos) + 1
+    endpos = startpos + int(str[pos + 1:startpos - 1])
+    return str[startpos:endpos], endpos
+
 
 def loads_str(str, pos):
-    startpos = str.index(":", pos)+1
-    endpos = startpos+int(str[pos+1:startpos-1])
-    return str[startpos:endpos], endpos
-
-def loads_unicode(str, pos):
-    startpos = str.index(":", pos)+1
-    endpos = startpos+int(str[pos+1:startpos-1])
+    startpos = str.index(b":", pos) + 1
+    endpos = startpos + int(str[pos + 1:startpos - 1])
     return str[startpos:endpos].decode("utf-8"), endpos
 
+
 def loads_list(str, pos, _lt=loads_table):
     pos += 1
     res = []
     append = res.append
-    while str[pos] != ";":
+    while str[pos] != ord(";"):
         obj, pos = _lt[str[pos]](str, pos)
         append(obj)
-    return res, pos+1
+    return res, pos + 1
+
 
 def loads_tuple(str, pos, _lt=loads_table):
     pos += 1
     res = []
     append = res.append
-    while str[pos] != ";":
+    while str[pos] != ord(";"):
         obj, pos = _lt[str[pos]](str, pos)
         append(obj)
-    return tuple(res), pos+1
+    return tuple(res), pos + 1
+
 
 def loads_dict(str, pos, _lt=loads_table):
     pos += 1
     res = {}
-    while str[pos] != ";":
+    while str[pos] != ord(";"):
         key, pos = _lt[str[pos]](str, pos)
         val, pos = _lt[str[pos]](str, pos)
         res[key] = val
-    return res, pos+1
+    return res, pos + 1
+
 
 def loads_none(str, pos):
-    return None, pos+1
-
-
-dumps_table.update({       bool: dumps_bool,
-                            int: dumps_int,
-                           long: dumps_int,
-                          float: dumps_float,
-                            str: dumps_str,
-                        unicode: dumps_unicode,
-                           list: dumps_list,
-                          tuple: dumps_tuple,
-                           dict: dumps_dict,
-                     type(None): dumps_none     })
-
-loads_table.update({ "b": loads_bool,
-                     "i": loads_int,
-                     "f": loads_float,
-                     "s": loads_str,
-                     "u": loads_unicode,
-                     "l": loads_list,
-                     "t": loads_tuple,
-                     "d": loads_dict,
-                     "n": loads_none     })
-
+    return None, pos + 1
+
+
+dumps_table.update({
+    bool: dumps_bool,
+    int: dumps_int,
+    float: dumps_float,
+    bytes: dumps_bytes,
+    str: dumps_str,
+    list: dumps_list,
+    tuple: dumps_tuple,
+    dict: dumps_dict,
+    type(None): dumps_none,
+    })
+
+loads_table.update({
+    ord("b"): loads_bool,
+    ord("i"): loads_int,
+    ord("f"): loads_float,
+    ord("c"): loads_str,
+    ord("s"): loads_str,
+    ord("u"): loads_str,
+    ord("l"): loads_list,
+    ord("t"): loads_tuple,
+    ord("d"): loads_dict,
+    ord("n"): loads_none,
+    })
 
=== modified file 'checkbox/contrib/glock.py'
--- checkbox/contrib/glock.py	2010-03-09 16:58:36 +0000
+++ checkbox/contrib/glock.py	2012-06-23 00:59:17 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: latin1 -*-
 #----------------------------------------------------------------------------
 # glock.py:                 Global mutex
@@ -70,11 +70,6 @@
     pass
 
 
-# Constants
-# ---------:
-if sys.version[:3] < '2.2':
-    True, False = 1, 0  # built-in in Python 2.2+
-
 #----------------------------------------------------------------------------
 class GlobalLock:
 #----------------------------------------------------------------------------
@@ -177,7 +172,7 @@
                 options = fcntl.LOCK_EX|fcntl.LOCK_NB
             try:
                 fcntl.flock(self.fdlock, options)
-            except IOError, message: #(errno 13: perm. denied,
+            except IOError as message: #(errno 13: perm. denied,
                             #       36: Resource deadlock avoided)
                 if not blocking and self._errnoOf (message) == errno.EWOULDBLOCK:
                     raise LockAlreadyAcquired('Lock %s already acquired by '
@@ -230,7 +225,7 @@
                 try:
                     win32event.ReleaseMutex(self.mutex)
                     #print "released mutex"
-                except pywintypes.error, e:
+                except pywintypes.error as e:
                     errCode, fctName, errMsg =  e.args
                     if errCode == 288:
                         raise NotOwner("Attempt to release somebody else's lock")
@@ -264,7 +259,7 @@
 #----------------------------------------------------------------------------
     ##TODO: a more serious test with distinct processes !
 
-    print 'Testing glock.py...'
+    print('Testing glock.py...')
 
     # unfortunately can't test inter-process lock here!
     lockName = 'myFirstLock'
@@ -283,31 +278,31 @@
     # Check that <> threads of same process do block:
     import threading, time
     thread = threading.Thread(target=threadMain, args=(l,))
-    print 'main: locking...',
+    print('main: locking...', end=' ')
     l.acquire()
-    print ' done.'
+    print(' done.')
     thread.start()
     time.sleep(3)
-    print '\nmain: unlocking...',
+    print('\nmain: unlocking...', end=' ')
     l.release()
-    print ' done.'
+    print(' done.')
     time.sleep(0.1)
 
-    print '=> Test of glock.py passed.'
+    print('=> Test of glock.py passed.')
     return l
 
 def threadMain(lock):
-    print 'thread started(%s).' % lock
+    print('thread started(%s).' % lock)
     try: lock.acquire(blocking=False)
     except LockAlreadyAcquired: pass
     else: raise Exception('should have raised LockAlreadyAcquired')
-    print 'thread: locking (should stay blocked for ~ 3 sec)...',
+    print('thread: locking (should stay blocked for ~ 3 sec)...', end=' ')
     lock.acquire()
-    print 'thread: locking done.'
-    print 'thread: unlocking...',
+    print('thread: locking done.')
+    print('thread: unlocking...', end=' ')
     lock.release()
-    print ' done.'
-    print 'thread ended.'
+    print(' done.')
+    print('thread ended.')
 
 #----------------------------------------------------------------------------
 #       M A I N
 
=== modified file 'checkbox/contrib/persist.py'
--- checkbox/contrib/persist.py	2012-02-23 11:56:50 +0000
+++ checkbox/contrib/persist.py	2012-06-23 00:59:17 +0000
@@ -41,7 +41,7 @@
     pass
 
 
-class Persist(object):
+class Persist:
     """Persistence handler.
 
     There are three different kinds of opition maps, regarding the
@@ -257,7 +257,7 @@
             current = self._traverse(map, path)
             if type(current) is list and value in current:
                 return
-        path = path+(sys.maxint,)
+        path = path+(sys.maxsize,)
         self._traverse(map, path, setvalue=value)
 
     def remove(self, path, value=NOTHING, soft=False, weak=False):
@@ -317,7 +317,7 @@
         return RootedPersist(self, path)
 
 
-class RootedPersist(object):
+class RootedPersist:
 
     def __init__(self, parent, root):
         self.parent = parent
@@ -408,7 +408,7 @@
     return ".".join(result)
 
 
-class Backend(object):
+class Backend:
 
     def new(self):
         return {}
@@ -491,7 +491,7 @@
         if keys:
             return keys()
         elif type(obj) is list:
-            return range(len(obj))
+            return list(range(len(obj)))
         return NotImplemented
 
 
@@ -513,18 +513,18 @@
 class PickleBackend(DiskBackend):
 
     def __init__(self):
-        import cPickle
+        import pickle
         self._pickle = cPickle
 
     def load(self, filepath):
-        file = open(filepath)
+        file = open(filepath, "rb")
         try:
             return self._pickle.load(file)
         finally:
             safe_close(file, self.safe_file_closing)
 
     def save(self, filepath, map):
-        file = open(filepath, "w")
+        file = open(filepath, "wb")
         try:
             self._pickle.dump(map, file, 2)
         finally:
@@ -538,14 +538,14 @@
         self._bpickle = bpickle
 
     def load(self, filepath):
-        file = open(filepath)
+        file = open(filepath, "rb")
         try:
             return self._bpickle.loads(file.read())
         finally:
             safe_close(file, self.safe_file_closing)
 
     def save(self, filepath, map):
-        file = open(filepath, "w")
+        file = open(filepath, "wb")
         try:
             file.write(self._bpickle.dumps(map))
         finally:
 
=== modified file 'checkbox/dispatcher.py'
--- checkbox/dispatcher.py	2011-11-18 12:46:21 +0000
+++ checkbox/dispatcher.py	2012-06-23 00:59:17 +0000
@@ -83,9 +83,9 @@
         # then behaves like a list using the latest events.
         if self.event_types.issubset(self.kwargs):
             self.notify = notify = super(ListenerQueue, self).notify
-            keys = self.kwargs.keys()
-            for values in product(*self.kwargs.values()):
-                self.kwargs = dict(zip(keys, values))
+            keys = list(self.kwargs.keys())
+            for values in product(*list(self.kwargs.values())):
+                self.kwargs = dict(list(zip(keys, values)))
                 notify(event)
 
 
@@ -171,7 +171,7 @@
 
     def registerHandler(self, event_types, handler, count=None):
         """See Dispatcher."""
-        if not isinstance(event_types, (list, tuple,)):
+        if not isinstance(event_types, (list, tuple)):
             event_types = (event_types,)
 
         listener = self.listener_factory(event_types, handler, count)
 
=== modified file 'checkbox/job.py'
--- checkbox/job.py	2012-02-15 00:11:21 +0000
+++ checkbox/job.py	2012-06-23 00:59:17 +0000
@@ -39,7 +39,7 @@
 
 DEFAULT_JOB_TIMEOUT = 30 # used in case a job specifies invalid timeout
 
-class Job(object):
+class Job:
 
     def __init__(self, command, environ=None, timeout=None):
         if environ is None:
@@ -93,8 +93,8 @@
                 (signal_to_name(term_signal),
                  signal_to_description(term_signal))
         else:
-            raise Exception, "Command not terminated: %s" \
-                % self.command
+            raise Exception("Command not terminated: %s" \
+                % self.command)
 
         duration = process.endtime - process.starttime
 
@@ -133,7 +133,7 @@
     def _find_matching_messages(self, **kwargs):
         for filename in self._walk_messages():
             message = self._read_message(filename,cache=True)
-            for key, value in kwargs.iteritems():
+            for key, value in kwargs.items():
                 if message.get(key) != value:
                     break
             else:
 
=== modified file 'checkbox/lib/cache.py'
--- checkbox/lib/cache.py	2009-01-20 18:55:20 +0000
+++ checkbox/lib/cache.py	2012-06-23 00:59:17 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-class Cache(object):
+class Cache:
 
     def __init__(self, function):
         self._cache = {}
@@ -27,7 +27,7 @@
         return self
 
     def __call__(self, *args):
-        if not self._cache.has_key((self._instance,) + args):
+        if (self._instance,) + args not in self._cache:
             self._cache[(self._instance,) + args] = self._function(self._instance, *args)
 
         return self._cache[(self._instance,) + args]
 
=== modified file 'checkbox/lib/config.py'
--- checkbox/lib/config.py	2012-02-10 11:19:05 +0000
+++ checkbox/lib/config.py	2012-06-23 00:59:17 +0000
@@ -19,9 +19,8 @@
 import os
 import re
 import logging
-import posixpath
 
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from checkbox.lib.text import split
 
@@ -32,7 +31,7 @@
         super(IncludeDict, self).__init__()
         self._parser = parser
 
-        for (key, value) in os.environ.iteritems():
+        for (key, value) in os.environ.items():
             if key.startswith("CHECKBOX"):
                 super(IncludeDict, self).__setitem__(key.lower(), value)
 
@@ -41,20 +40,18 @@
             if isinstance(value, list):
                 value = value[0]
             for path in split(value):
-                path = self._parser._interpolate("DEFAULT", None, path, self)
-                path = posixpath.expanduser(path)
-                if not posixpath.exists(path):
-                    raise Exception, "No such configuration file: %s" % path
-                if posixpath.isdir(path):
+                path = self._parser._interpolation.before_get(
+                    self._parser, "DEFAULT", None, path, self)
+                path = os.path.expanduser(path)
+                if not os.path.exists(path):
+                    raise Exception("No such configuration file: %s" % path)
+                if os.path.isdir(path):
                     logging.info("Parsing config filenames from directory: %s",
                         path)
-                    def walk_func(arg, directory, names):
-                        for name in names:
-                            path = posixpath.join(directory, name)
-                            if not posixpath.isdir(path):
-                                arg._parser.read(path)
-
-                    posixpath.walk(path, walk_func, self)
+                    for dirpath, dirnames, filenames in os.walk(path):
+                        for filename in filenames:
+                            path = os.path.join(dirpath, filename)
+                            self._parser.read(path)
                 else:
                     logging.info("Parsing config filename: %s", path)
                     self._parser.read(path)
@@ -64,20 +61,20 @@
             super(IncludeDict, self).__setitem__(key, value)
 
 
-class ConfigSection(object):
+class ConfigSection:
 
     def __init__(self, parent, name, attributes={}):
         self.parent = parent
         self.name = name
         self.attributes = {}
-        for key, value in attributes.iteritems():
+        for key, value in attributes.items():
             self.attributes[key] = re.sub("\n\.\n", "\n\n", value)
 
     def __getattr__(self, name):
         if name in self.attributes:
             return self.get(name)
 
-        raise AttributeError, name
+        raise AttributeError(name)
 
     def __contains__(self, name):
         return name in self.attributes
@@ -96,7 +93,7 @@
         if name in self.attributes:
             return self.get(name)
 
-        raise AttributeError, name
+        raise AttributeError(name)
 
     def get(self, name):
         name_upper = name.upper()
@@ -106,10 +103,10 @@
             return os.environ[name_upper]
 
 
-class Config(object):
+class Config:
 
     def __init__(self):
-        self._parser = ConfigParser()
+        self._parser = ConfigParser(empty_lines_in_values=False)
         self._parser._defaults = IncludeDict(self._parser)
 
         # Copy attributes from the parser to avoid one additional
@@ -121,7 +118,7 @@
         for config in configs:
             match = re.match("(.*)/([^/]+)=(.*)", config)
             if not match:
-                raise Exception, "Invalid config string: %s" % config
+                raise Exception("Invalid config string: %s" % config)
 
             (name, option, value) = match.groups()
 
@@ -145,11 +142,11 @@
     def read_file(self, file, filename="<stream>"):
         logging.info("Reading configurations from: %s", filename)
 
-        self._parser.readfp(file, filename)
+        self._parser.read_file(file, filename)
 
     def read_filename(self, filename):
-        if not posixpath.exists(filename):
-            raise Exception, "No such configuration file: %s" % filename
+        if not os.path.exists(filename):
+            raise Exception("No such configuration file: %s" % filename)
 
         file = open(filename, "r")
         return self.read_file(file, filename)
 
=== modified file 'checkbox/lib/conversion.py'
--- checkbox/lib/conversion.py	2011-11-18 12:46:21 +0000
+++ checkbox/lib/conversion.py	2012-06-23 00:59:17 +0000
@@ -18,12 +18,13 @@
 #
 import re
 
-from dateutil import tz
 from datetime import (
     datetime,
     timedelta,
     )
 
+from checkbox.lib.tz import tzutc
+
 
 DATETIME_RE = re.compile(r"""
     ^(?P<year>\d\d\d\d)-?(?P<month>\d\d)-?(?P<day>\d\d)
@@ -108,8 +109,7 @@
         milliseconds = 999999
 
     dt = datetime(
-        year, month, day, hour, minute, second, milliseconds,
-        tzinfo=tz.tzutc())
+        year, month, day, hour, minute, second, milliseconds, tzinfo=tzutc)
 
     tz_sign = time_parts['tz_sign']
     tz_hour = time_parts['tz_hour']
@@ -150,7 +150,7 @@
 
     :param string: The string representation.
     """
-    if isinstance(string, basestring):
+    if isinstance(string, str):
         for regex, formatter in TYPE_FORMATS:
             match = regex.match(string)
             if match:
 
=== modified file 'checkbox/lib/enum.py'
--- checkbox/lib/enum.py	2011-06-13 14:22:39 +0000
+++ checkbox/lib/enum.py	2012-06-23 00:59:17 +0000
@@ -25,7 +25,7 @@
     pass
 
 
-class Enum(object):
+class Enum:
 
     def __init__(self, *names):
         value = 0
@@ -44,7 +44,7 @@
                         "enum value does not define: %s" % value)
                 value = getattr(self, value)
 
-            if not isinstance(value, (int, long)):
+            if not isinstance(value, int):
                 raise EnumException(
                     "enum value is not an integer: %s" % value)
 
 
=== modified file 'checkbox/lib/fifo.py'
--- checkbox/lib/fifo.py	2011-06-13 14:22:39 +0000
+++ checkbox/lib/fifo.py	2012-06-23 00:59:17 +0000
@@ -22,26 +22,27 @@
 from checkbox.contrib.bpickle import dumps, loads
 from checkbox.lib.selector import Selector, SelectorIO
 
-class FifoBase(object):
-
-    mode = None
+
+class FifoBase:
+
+    flags = None
 
     def __init__(self, path, timeout=None):
         self.path = path
-        self.file = open(path, self.mode)
+        self.fileno = os.open(path, self.flags)
         self._timeout = timeout
 
     def __del__(self):
         self.close()
 
     def close(self):
-        self.file.close()
+        os.close(self.fileno)
 
     def wait_for(self, operation):
         if self._timeout is not None:
             selector = Selector()
             selector.set_timeout(self._timeout)
-            selector.add_fd(self.file.fileno(), operation)
+            selector.add_fd(self.fileno, operation)
 
             selector.execute()
 
@@ -49,57 +50,53 @@
                 return False
         return True
 
+
 class FifoReader(FifoBase):
 
-    #on Linux, opening a FIFO in read-write mode is non-blocking and
-    #succeeds even if other end is not open as per FIFO(7)
-    mode = "w+"
+    flags = os.O_RDWR
 
-    def read_string(self):
+    def read_bytes(self):
         # Check if a connection arrived within the timeout
         if not self.wait_for(SelectorIO.READ):
             return None
 
         size = struct.calcsize("i")
-        length_string = self.file.read(size)
-        if not length_string:
-            return ""
+        length_bytes = os.read(self.fileno, size)
+        if not length_bytes:
+            return b""
 
-        length = struct.unpack(">i", length_string)[0]
-        return self.file.read(length)
+        length = struct.unpack(">i", length_bytes)[0]
+        return os.read(self.fileno, length)
 
     def read_object(self):
-        string = self.read_string()
-        if not string:
+        _bytes = self.read_bytes()
+        if not _bytes:
             return None
 
-        return loads(string)
+        return loads(_bytes)
 
 
 class FifoWriter(FifoBase):
 
-    #on Linux, opening a FIFO in read-write mode is non-blocking and
-    #succeeds even if other end is not open as per FIFO(7)
-    mode = "w+"
-
-    def write_string(self, string):
-
-        # Wait until I can write 
+    flags = os.O_RDWR | os.O_CREAT | os.O_TRUNC
+
+    def write_bytes(self, _bytes):
+
+        # Wait until I can write
         if not self.wait_for(SelectorIO.WRITE):
-            return None 
+            return None
 
-        length = len(string)
-        length_string = struct.pack(">i", length)
-        self.file.write(length_string)
-        self.file.write(string)
-        self.file.flush()
+        length = len(_bytes)
+        length_bytes = struct.pack(">i", length)
+        os.write(self.fileno, length_bytes)
+        os.write(self.fileno, _bytes)
         return length
 
     def write_object(self, object):
-        string = dumps(object)
-        return self.write_string(string)
-
-
-def create_fifo(path, mode=0666):
+        _bytes = dumps(object)
+        return self.write_bytes(_bytes)
+
+
+def create_fifo(path, mode=0o666):
     os.mkfifo(path, mode)
     return path
 
=== modified file 'checkbox/lib/log.py'
--- checkbox/lib/log.py	2011-07-01 11:37:27 +0000
+++ checkbox/lib/log.py	2012-06-23 00:59:17 +0000
@@ -36,7 +36,7 @@
         if kwargs:
             args_string += ", "
     if kwargs:
-        args_string += ", ".join(["%s=%s" % (k, v) for k, v in kwargs.iteritems()])
+        args_string += ", ".join(["%s=%s" % (k, v) for k, v in kwargs.items()])
 
     module = object.__module__ if object.__module__ else inspect.getfile(object)
     if inspect.ismethod(object):
 
=== modified file 'checkbox/lib/path.py'
--- checkbox/lib/path.py	2009-01-20 18:55:20 +0000
+++ checkbox/lib/path.py	2012-06-23 00:59:17 +0000
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import posixpath
+import os
 
 from glob import glob
 
 
 def path_split(path):
-    return path.split(posixpath.sep)
+    return path.split(os.path.sep)
 
 def path_common(l1, l2, common=[]):
     if len(l1) < 1:
@@ -40,26 +40,22 @@
     (common, l1, l2) = path_common(path_split(p1), path_split(p2))
     p = []
     if len(l1) > 0:
-        p = ["..%s" % posixpath.sep * len(l1)]
+        p = ["..%s" % os.path.sep * len(l1)]
 
     p = p + l2
-    return posixpath.join( *p )
+    return os.path.join( *p )
 
 def path_expand(path):
-    path = posixpath.expanduser(path)
+    path = os.path.expanduser(path)
     return glob(path)
 
 def path_expand_recursive(path):
     paths = []
     for path in path_expand(path):
-        if posixpath.isdir(path):
-            def walk_func(arg, directory, names):
-                for name in names:
-                    path = posixpath.join(directory, name)
-                    if not posixpath.isdir(path):
-                        arg.append(path)
-
-            posixpath.walk(path, walk_func, paths)
+        if os.path.isdir(path):
+            for dirpath, dirnames, filenames in os.walk(path):
+                for filename in filenames:
+                    paths.append(os.path.join(dirpath, filename))
         else:
             paths.append(path)
 
 
=== modified file 'checkbox/lib/process.py'
--- checkbox/lib/process.py	2012-03-07 19:46:29 +0000
+++ checkbox/lib/process.py	2012-06-23 00:59:17 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import absolute_import
+
 
 import os
 import time
@@ -56,7 +56,7 @@
         # that it would block waiting for a full BUFSIZ unless we explicitly
         # set the files non blocking, and there would be extra uneeded
         # overhead like EOL conversion. So I think it's handier to use os.read()
-        self.outdata = self.errdata = ""
+        self.outdata = self.errdata = b""
         self.starttime = self.endtime = None
         self._outeof = self._erreof = False
 
@@ -77,7 +77,8 @@
         os.dup2(self.outw, STDOUT_FILENO)
         os.dup2(self.errw, STDERR_FILENO)
         # stdout and stderr connected to pipe, so close all other files
-        map(os.close, [self.outr, self.outw, self.errr, self.errw])
+        for fileno in self.outr, self.outw, self.errr, self.errw:
+            os.close(fileno)
         try:
             cmd = ["/bin/bash", "-c", cmd]
             os.execve(cmd[0], cmd, env)
@@ -103,12 +104,12 @@
             else:
                 if self.outr in ready[0]:
                     outchunk = os.read(self.outr, self.BUFSIZ)
-                    if outchunk == "":
+                    if outchunk == b"":
                         self._outeof = True
                     self.outdata += outchunk
                 if self.errr in ready[0]:
                     errchunk = os.read(self.errr, self.BUFSIZ)
-                    if errchunk == "":
+                    if errchunk == b"":
                         self._erreof = True
                     self.errdata += errchunk
                 if self._outeof and self._erreof:
 
=== modified file 'checkbox/lib/redirect.py'
--- checkbox/lib/redirect.py	2010-03-09 16:58:36 +0000
+++ checkbox/lib/redirect.py	2012-06-23 00:59:17 +0000
@@ -52,28 +52,28 @@
     file = _file_write(file)
     sys.stdout, file = file, sys.stdout
     try:
-        ret = apply(func, args)
+        ret = func(*args)
     finally:
-        print ret
+        print(ret)
         sys.stdout, file = file, sys.stdout
     return ret
 
 def redirect_to_string(func, *args):
     # apply func(*args) with stdout redirected to return string.
     file = tempfile.TemporaryFile()
-    apply(redirect_to_file, (file, func) + args)
+    redirect_to_file(*(file, func) + args)
     file.seek(0)
     return file.read()
 
 def redirect_to_lines(func, *args):
     # apply func(*args), returning a list of redirected stdout lines.
     file = tempfile.TemporaryFile()
-    apply(redirect_to_file, (file, func) + args)
+    redirect_to_file(*(file, func) + args)
     file.seek(0)
     return file.readlines()
 
 
-class RedirectTee(object):
+class RedirectTee:
 
     def __init__(self, *optargs):
         self._files = []
@@ -114,7 +114,7 @@
         return 0
 
 
-class RedirectEcho(object):
+class RedirectEcho:
 
     def __init__(self, input, *output):
         self._infile = _file_read(input)
@@ -124,7 +124,7 @@
             self._output = None
 
     def read(self, *howmuch):
-        stuff = apply(self._infile.read, howmuch)
+        stuff = self._infile.read(*howmuch)
         if self._output:
             self._output.write(stuff)
         return stuff
 
=== modified file 'checkbox/lib/resolver.py'
--- checkbox/lib/resolver.py	2010-03-09 16:58:36 +0000
+++ checkbox/lib/resolver.py	2012-06-23 00:59:17 +0000
@@ -21,13 +21,10 @@
     Main class. Instantiate with the root directory of your items.
     """
 
-    def __init__(self, compare=None, key=None):
-        if compare is None:
-            compare = lambda a, b: cmp(a, b)
+    def __init__(self, key=None):
         if key is None:
             key = lambda k: k
 
-        self.compare = compare
         self.key = key
 
         # detect repeated resolution attempts - these indicate some circular dependency
@@ -43,7 +40,7 @@
     def add(self, item, *dependencies):
         key = self.key(item)
         if key in self.items:
-            raise Exception, "%s: key already exists" % key
+            raise Exception("%s: key already exists" % key)
         self.items[key] = item
 
         dependency_keys = [self.key(d) for d in dependencies]
@@ -69,7 +66,7 @@
             msg = "no dependencies found for %s" % key
             if found:
                 msg += " while resolving %s" % found
-            raise Exception, msg
+            raise Exception(msg)
 
         dependencies = self.dependencies.get(key, set())
         resolved = set()
@@ -81,7 +78,7 @@
                     scapegoat = found
                 else:
                     scapegoat = dependency
-                raise Exception, "circular dependency involving %s and %s" % (key, scapegoat)
+                raise Exception("circular dependency involving %s and %s" % (key, scapegoat))
             # add resolution
             self.reentrant_resolution.add(resolution_step)
             # and its dependencies, if any
@@ -104,18 +101,14 @@
         if item:
             # Immediate dependents
             key = self.key(item)
-            all_dependents = filter(
-                lambda x: key in self.resolve(x)[:-1],
-                self.items.itervalues())
-            dependents = filter(
-                lambda x: self.key(self.get_dependencies(x)[-2]) == key,
-                all_dependents)
+            all_dependents = [x for x in iter(self.items.values()) if key in self.resolve(x)[:-1]]
+            dependents = [x for x in all_dependents if self.key(self.get_dependencies(x)[-2]) == key]
         else:
             # First level of dependents
-            dependents = filter(lambda x: len(self.resolve(x)) == 1, self.items.itervalues())
+            dependents = [x for x in iter(self.items.values()) if len(self.resolve(x)) == 1]
 
         index = 0
-        dependents = sorted(dependents, self.compare)
+        dependents = sorted(dependents)
         while index < len(dependents):
             sub_dependents = self.get_dependents(dependents[index])
             if sub_dependents:
 
=== modified file 'checkbox/lib/safe.py'
--- checkbox/lib/safe.py	2012-02-23 11:56:50 +0000
+++ checkbox/lib/safe.py	2012-06-23 00:59:17 +0000
@@ -17,72 +17,70 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
 import os
-import posixpath
+import hashlib
 import shutil
 
 from stat import ST_MODE, S_IMODE, S_ISFIFO
 
 
 def safe_change_mode(path, mode):
-    if not posixpath.exists(path):
-        raise Exception, "Path does not exist: %s" % path
+    if not os.path.exists(path):
+        raise Exception("Path does not exist: %s" % path)
 
     old_mode = os.stat(path)[ST_MODE]
     if mode != S_IMODE(old_mode):
         os.chmod(path, mode)
 
-def safe_make_directory(path, mode=0755):
-    if posixpath.exists(path):
-        if not posixpath.isdir(path):
-            raise Exception, "Path is not a directory: %s" % path
+def safe_make_directory(path, mode=0o755):
+    if os.path.exists(path):
+        if not os.path.isdir(path):
+            raise Exception("Path is not a directory: %s" % path)
     else:
         os.makedirs(path, mode)
 
-def safe_make_fifo(path, mode=0666):
-    if posixpath.exists(path):
+def safe_make_fifo(path, mode=0o666):
+    if os.path.exists(path):
         mode = os.stat(path)[ST_MODE]
         if not S_ISFIFO(mode):
-            raise Exception, "Path is not a FIFO: %s" % path
+            raise Exception("Path is not a FIFO: %s" % path)
     else:
         os.mkfifo(path, mode)
 
 def safe_remove_directory(path):
-    if posixpath.exists(path):
-        if not posixpath.isdir(path):
-            raise Exception, "Path is not a directory: %s" % path
+    if os.path.exists(path):
+        if not os.path.isdir(path):
+            raise Exception("Path is not a directory: %s" % path)
 
         shutil.rmtree(path)
 
 def safe_remove_file(path):
-    if posixpath.exists(path):
-        if not posixpath.isfile(path):
-            raise Exception, "Path is not a file: %s" % path
+    if os.path.exists(path):
+        if not os.path.isfile(path):
+            raise Exception("Path is not a file: %s" % path)
 
         os.remove(path)
 
 def safe_rename(old, new):
     if old != new:
-        if not posixpath.exists(old):
-            raise Exception, "Old path does not exist: %s" % old
-        if posixpath.exists(new):
-            raise Exception, "New path exists already: %s" % new
+        if not os.path.exists(old):
+            raise Exception("Old path does not exist: %s" % old)
+        if os.path.exists(new):
+            raise Exception("New path exists already: %s" % new)
 
         os.rename(old, new)
 
-def safe_md5sum():
-    try:
-        import hashlib
-        digest = hashlib.md5()
-    except ImportError:
-        # for Python << 2.5
-        import md5
-        digest = md5.new()
-
-    return digest
+class safe_md5sum:
+
+    def __init__(self):
+        self.digest = hashlib.md5()
+        self.hexdigest = self.digest.hexdigest
+
+    def update(self, string):
+        self.digest.update(string.encode("utf-8"))
 
 def safe_md5sum_file(name):
     md5sum = None
-    if posixpath.exists(name):
+    if os.path.exists(name):
         file = open(name)
         digest = safe_md5sum()
         while 1:
 
=== modified file 'checkbox/lib/script.py'
--- checkbox/lib/script.py	2009-01-20 18:55:20 +0000
+++ checkbox/lib/script.py	2012-06-23 00:59:17 +0000
@@ -26,8 +26,8 @@
     if not posixpath.exists(path):
         path = get_path(script)
         if not path:
-            raise Exception, "Script not found in PATH: %s" % script
+            raise Exception("Script not found in PATH: %s" % script)
 
     globals = {}
-    execfile(path, globals)
+    exec(compile(open(path).read(), path, 'exec'), globals)
     return globals
 
=== modified file 'checkbox/lib/selector.py'
--- checkbox/lib/selector.py	2011-06-13 14:22:39 +0000
+++ checkbox/lib/selector.py	2012-06-23 00:59:17 +0000
@@ -39,7 +39,7 @@
     "FAILED")
 
 
-class Selector(object):
+class Selector:
     __slots__ = ("_read_fds", "_write_fds", "_except_fds",
         "_save_read_fds", "_save_write_fds", "_save_except_fds",
         "_fd_set_size", "_timeout", "_state", "_errno")
@@ -166,7 +166,7 @@
             self._read_fds, self._write_fds, self._except_fds = select.select(
                 self._save_read_fds, self._save_write_fds,
                 self._save_except_fds, self._timeout)
-        except select.error, e:
+        except select.error as e:
             self._errno = e.errno
             if e.errno == errno.EINTR:
                 self._state = SelectorState.SIGNALED
 
=== modified file 'checkbox/lib/signal.py'
--- checkbox/lib/signal.py	2009-03-31 13:54:12 +0000
+++ checkbox/lib/signal.py	2012-06-23 00:59:17 +0000
@@ -72,7 +72,7 @@
     signal -- number of the signal as returned by wait
     """
 
-    if signal_name_table.has_key(signal):
+    if signal in signal_name_table:
         return signal_name_table[signal]
     return _("UNKNOWN")
 
@@ -84,6 +84,6 @@
     """
 
     name = signal_to_name(signal)
-    if signal_description_table.has_key(name):
+    if name in signal_description_table:
         return signal_description_table[name]
     return _("Unknown signal")
 
=== modified file 'checkbox/lib/template.py'
--- checkbox/lib/template.py	2011-11-18 12:46:21 +0000
+++ checkbox/lib/template.py	2012-06-23 00:59:17 +0000
@@ -23,7 +23,7 @@
 EXTENDED_STRING = "_extended"
 
 
-class Template(object):
+class Template:
 
     def _reader(self, file, size=4096, delimiter=r"\n{2,}"):
         buffer_old = ""
@@ -42,7 +42,7 @@
 
     def dump_file(self, elements, file, filename="<stream>"):
         for element in elements:
-            for long_key in element.keys():
+            for long_key in list(element.keys()):
                 if long_key.endswith(EXTENDED_STRING):
                     short_key = long_key.replace(EXTENDED_STRING, "")
                     del element[short_key]
@@ -79,11 +79,10 @@
             def _save(field, value, extended):
                 extended = extended.rstrip("\n")
                 if field:
-                    if element.has_key(field):
-                        raise Exception, \
-                            "Template %s has a duplicate field '%s'" \
+                    if field in element:
+                        raise Exception("Template %s has a duplicate field '%s'" \
                             " with a new value '%s'." \
-                                % (filename, field, value)
+                                % (filename, field, value))
                     element[field] = value
                     if extended:
                         element["%s%s" % (field, EXTENDED_STRING)] = extended
@@ -128,8 +127,8 @@
                     extended += bit
                     continue
 
-                raise Exception, "Template %s parse error at: %s" \
-                    % (filename, line)
+                raise Exception("Template %s parse error at: %s" \
+                    % (filename, line))
 
             _save(field, value, extended)
 
@@ -140,5 +139,5 @@
     def load_filename(self, filename):
         logging.info("Loading elements from filename: %s", filename)
 
-        file = open(filename, "r")
+        file = open(filename, "r", encoding="utf-8")
         return self.load_file(file, filename)
 
=== modified file 'checkbox/lib/template_i18n.py'
--- checkbox/lib/template_i18n.py	2012-02-10 11:19:05 +0000
+++ checkbox/lib/template_i18n.py	2012-06-23 00:59:17 +0000
@@ -53,7 +53,7 @@
 
         language_match = re.match(r"([^_@.]+)(_[^_@.]+)?(\..+)?", language)
         if not language_match:
-            raise Exception, "Unknown language format: %s" % language
+            raise Exception("Unknown language format: %s" % language)
 
         ret = [language_match.group(1)]
         if modifier_match:
@@ -75,7 +75,7 @@
 
     def _get_languages(self):
         languages = []
-        if environ.has_key("LANGUAGE") and environ["LANGUAGE"]:
+        if "LANGUAGE" in environ and environ["LANGUAGE"]:
             for language in environ["LANGUAGE"].split(":"):
                 if language:
                     languages.extend(self._get_language_list(language))
@@ -96,11 +96,11 @@
     def _filter_languages(self, element):
         filter = {}
         basekeys = {}
-        for key in element.iterkeys():
+        for key in element.keys():
             basekey = re.sub(r"^_?([^-]+).*$", "\\1", key)
             basekeys[basekey] = None
 
-        for key in basekeys.iterkeys():
+        for key in basekeys.keys():
             if self._languages:
                 for language in self._languages:
                     field = "%s-%s" % (key, language)
@@ -124,7 +124,7 @@
                     filter[key] = self._filter_field(element[field])
                     continue
 
-            raise Exception, "No language found for key: %s" % key
+            raise Exception("No language found for key: %s" % key)
 
         return filter
 
 
=== modified file 'checkbox/lib/tests/resolver.py'
--- checkbox/lib/tests/resolver.py	2009-08-19 15:36:05 +0000
+++ checkbox/lib/tests/resolver.py	2012-06-23 00:59:17 +0000
@@ -26,7 +26,7 @@
         resolver = Resolver()
         try:
             resolver.get_dependencies('a')
-        except Exception, error:
+        except Exception as error:
             self.assertTrue(error.args[0].startswith('no dependencies'))
         else:
             self.fail('non existing element accepted by resolver')
@@ -67,7 +67,7 @@
         resolver.add('b', 'a')
         try:
             resolver.get_dependencies('a')
-        except Exception, error:
+        except Exception as error:
             self.assertTrue(error.args[0].startswith('circular dependency'))
         else:
             self.fail('circular dependency not detected')
 
=== modified file 'checkbox/lib/transport.py'
--- checkbox/lib/transport.py	2011-09-29 13:12:01 +0000
+++ checkbox/lib/transport.py	2012-06-23 00:59:17 +0000
@@ -22,101 +22,67 @@
 import re
 import stat
 import sys
-import posixpath
 
-import mimetools
+import email.generator
+import http.client
 import mimetypes
 import socket
-import httplib
-import urllib
-
-
-# Build the appropriate socket wrapper for ssl
-try:
-    # Python 2.6 introduced a better ssl package
-    import ssl
-    _ssl_wrap_socket = ssl.wrap_socket
-except ImportError:
-    # Python versions prior to 2.6 don't have ssl and ssl.wrap_socket instead
-    # they use httplib.FakeSocket
-    def _ssl_wrap_socket(sock, key_file, cert_file):
-        ssl_sock = socket.ssl(sock, key_file, cert_file)
-        return httplib.FakeSocket(sock, ssl_sock)
-
-try:
-    # Python 2.6 introduced create_connection convenience function
-    create_connection = socket.create_connection
-except AttributeError:
-    def create_connection(address, timeout=None):
-        msg = "getaddrinfo returns an empty list"
-        host, port = address
-        for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
-            af, socktype, proto, canonname, sa = res
-            sock = None
-            try:
-                sock = socket.socket(af, socktype, proto)
-                if timeout is not None:
-                    sock.settimeout(timeout)
-                sock.connect(sa)
-                return sock
-
-            except socket.error, msg:
-                if sock is not None:
-                    sock.close()
-
-        raise socket.error, msg
-
-
-class ProxyHTTPConnection(httplib.HTTPConnection):
-
-    _ports = {"http" : httplib.HTTP_PORT, "https" : httplib.HTTPS_PORT}
+import ssl
+import urllib.request, urllib.parse, urllib.error
+
+
+class ProxyHTTPConnection(http.client.HTTPConnection):
+
+    _ports = {"http": http.client.HTTP_PORT, "https": http.client.HTTPS_PORT}
 
     def request(self, method, url, body=None, headers={}):
         #request is called before connect, so can interpret url and get
         #real host/port to be used to make CONNECT request to proxy
-        scheme, rest = urllib.splittype(url)
+        scheme, rest = urllib.parse.splittype(url)
         if scheme is None:
-            raise ValueError, "unknown URL type: %s" % url
+            raise ValueError("unknown URL type: %s" % url)
         #get host
-        host, rest = urllib.splithost(rest)
+        host, rest = urllib.parse.splithost(rest)
         #try to get port
-        host, port = urllib.splitport(host)
+        host, port = urllib.parse.splitport(host)
         #if port is not defined try to get from scheme
         if port is None:
             try:
                 port = self._ports[scheme]
             except KeyError:
-                raise ValueError, "unknown protocol for: %s" % url
+                raise ValueError("unknown protocol for: %s" % url)
         else:
             port = int(port)
 
         self._real_host = host
         self._real_port = port
-        httplib.HTTPConnection.request(self, method, url, body, headers)
+        http.client.HTTPConnection.request(self, method, url, body, headers)
 
     def connect(self):
-        httplib.HTTPConnection.connect(self)
+        http.client.HTTPConnection.connect(self)
         #send proxy CONNECT request
-        self.send("CONNECT %s:%d HTTP/1.0\r\n\r\n" % (self._real_host, self._real_port))
+        self.send((
+            "CONNECT %s:%d HTTP/1.0\r\n\r\n" % (self._real_host, self._real_port)
+            ).encode("ascii"))
         #expect a HTTP/1.0 200 Connection established
-        response = self.response_class(self.sock, strict=self.strict, method=self._method)
+        response = self.response_class(self.sock, method=self._method)
         (version, code, message) = response._read_status()
         #probably here we can handle auth requests...
         if code != 200:
             #proxy returned and error, abort connection, and raise exception
             self.close()
-            raise socket.error, "Proxy connection failed: %d %s" % (code, message.strip())
+            raise socket.error("Proxy connection failed: %d %s" % (code, message.strip()))
         #eat up header block from proxy....
         while True:
-            #should not use directly fp probablu
+            #should not use directly fp probably
             line = response.fp.readline()
-            if line == "\r\n":
+            if line == b"\r\n":
                 break
 
 
 class ProxyHTTPSConnection(ProxyHTTPConnection):
 
-    default_port = httplib.HTTPS_PORT
+    default_port = http.client.HTTPS_PORT
 
     def __init__(self, host, port=None, key_file=None, cert_file=None, strict=None):
         ProxyHTTPConnection.__init__(self, host, port)
@@ -125,10 +91,10 @@
 
     def connect(self):
         ProxyHTTPConnection.connect(self)
-        self.sock = _ssl_wrap_socket(self.sock, self.key_file, self.cert_file)
-
-
-class VerifiedHTTPSConnection(httplib.HTTPSConnection):
+        self.sock = ssl.wrap_socket(self.sock, self.key_file, self.cert_file)
+
+
+class VerifiedHTTPSConnection(http.client.HTTPSConnection):
 
     # Compatibility layer with Python 2.5
     timeout = None
@@ -163,14 +129,14 @@
     def connect(self):
         # overrides the version in httplib so that we do
         #    certificate verification
-        sock = create_connection((self.host, self.port), self.timeout)
+        sock = socket.create_connection((self.host, self.port), self.timeout)
         if self._tunnel_host:
             self.sock = sock
             self._tunnel()
 
         # wrap the socket using verification with the root
         #    certs in trusted_root_certs
-        self.sock = _ssl_wrap_socket(sock,
+        self.sock = ssl.wrap_socket(sock,
             self.key_file,
             self.cert_file,
             cert_reqs=ssl.CERT_REQUIRED,
@@ -181,20 +147,20 @@
                 "Failed to verify cert for hostname: %s" % self.host)
 
 
-class HTTPTransport(object):
+class HTTPTransport:
     """Transport makes a request to exchange message data over HTTP."""
 
     def __init__(self, url):
         self.url = url
 
-        proxies = urllib.getproxies()
+        proxies = urllib.request.getproxies()
         self.http_proxy = proxies.get("http")
         self.https_proxy = proxies.get("https")
 
     def _unpack_host_and_port(self, string):
-        scheme, rest = urllib.splittype(string)
-        host, rest = urllib.splithost(rest)
-        host, port = urllib.splitport(host)
+        scheme, rest = urllib.parse.splittype(string)
+        host, rest = urllib.parse.splithost(rest)
+        host, port = urllib.parse.splitport(host)
         if port is not None:
             port = int(port)
 
@@ -204,14 +170,14 @@
         if timeout:
             socket.setdefaulttimeout(timeout)
 
-        scheme, rest = urllib.splittype(self.url)
+        scheme, rest = urllib.parse.splittype(self.url)
         if scheme == "http":
             if self.http_proxy:
                 host, port = self._unpack_host_and_port(self.http_proxy)
             else:
                 host, port = self._unpack_host_and_port(self.url)
 
-            connection = httplib.HTTPConnection(host, port)
+            connection = http.client.HTTPConnection(host, port)
         elif scheme == "https":
             if self.https_proxy:
                 host, port = self._unpack_host_and_port(self.https_proxy)
@@ -220,18 +186,18 @@
                 host, port = self._unpack_host_and_port(self.url)
                 connection = VerifiedHTTPSConnection(host, port)
         else:
-            raise Exception, "Unknown URL scheme: %s" % scheme
+            raise Exception("Unknown URL scheme: %s" % scheme)
 
         return connection
 
     def _encode_multipart_formdata(self, fields=[], files=[]):
-        boundary = mimetools.choose_boundary()
+        boundary = email.generator._make_boundary().encode("ascii")
 
         lines = []
         for (key, value) in fields:
-            lines.append("--" + boundary)
-            lines.append("Content-Disposition: form-data; name=\"%s\"" % key)
-            lines.append("")
+            lines.append(b"--" + boundary)
+            lines.append(b"Content-Disposition: form-data; name=\"" + key + b"\"")
+            lines.append(b"")
             lines.append(value)
 
         for (key, file) in files:
@@ -240,27 +206,30 @@
             else:
                 length = os.fstat(file.fileno())[stat.ST_SIZE]
 
-            filename = posixpath.basename(file.name)
-            if isinstance(filename, unicode):
-                filename = filename.encode("UTF-8")
-
-            lines.append("--" + boundary)
-            lines.append("Content-Disposition: form-data; name=\"%s\"; filename=\"%s\""
-                % (key, filename))
-            lines.append("Content-Type: %s"
-                % mimetypes.guess_type(filename)[0] or "application/octet-stream")
-            lines.append("Content-Length: %s" % length)
-            lines.append("")
+            content_type = mimetypes.guess_type(file.name)[0]
+            if content_type:
+                content_type = content_type.encode("ascii")
+            else:
+                content_type = b"application/octet-stream"
+
+            filename = os.path.basename(file.name)
+            filename = filename.encode("utf-8")
+
+            lines.append(b"--" + boundary)
+            lines.append(b"Content-Disposition: form-data; name=\"" + key + b"\"; filename=\"" + filename + b"\"")
+            lines.append(b"Content-Type: " + content_type)
+            lines.append(b"Content-Length: " + str(length).encode("ascii"))
+            lines.append(b"")
 
             if hasattr(file, "seek"):
                 file.seek(0)
             lines.append(file.read())
 
-        lines.append("--" + boundary + "--")
-        lines.append("")
+        lines.append(b"--" + boundary + b"--")
+        lines.append(b"")
 
-        content_type = "multipart/form-data; boundary=%s" % boundary
-        body = "\r\n".join(lines)
+        content_type = b"multipart/form-data; boundary=" + boundary
+        body = b"\r\n".join(lines)
 
         return content_type, body
 
@@ -268,33 +237,34 @@
         fields = []
         files = []
 
-        content_type = "application/octet-stream"
-        if body is not None and type(body) != str:
+        content_type = b"application/octet-stream"
+        if body is not None and type(body) != bytes:
             if hasattr(body, "items"):
-                body = body.items()
+                body = list(body.items())
             else:
                 try:
                     if len(body) and not isinstance(body[0], tuple):
                         raise TypeError
                 except TypeError:
                     ty, va, tb = sys.exc_info()
-                    raise TypeError, \
-                        "Invalid non-string sequence or mapping", tb
+                    raise TypeError("Invalid non-string sequence or mapping").with_traceback(tb)
 
             for key, value in body:
+                key = key.encode("ascii")
                 if hasattr(value, "read"):
                     files.append((key, value))
                 else:
+                    value = value.encode("utf-8")
                     fields.append((key, value))
 
             if files:
-                content_type, body = self._encode_multipart_formdata(fields,
-                    files)
+                content_type, body = self._encode_multipart_formdata(
+                    fields, files)
             elif fields:
-                content_type = "application/x-www-form-urlencoded"
-                body = urllib.urlencode(fields)
+                content_type = b"application/x-www-form-urlencoded"
+                body = urllib.parse.urlencode(fields).encode("utf-8")
             else:
-                body = ""
+                body = b""
 
         return content_type, body
 
@@ -325,10 +295,10 @@
         else:
             try:
                 response = connection.getresponse()
-            except httplib.BadStatusLine:
+            except http.client.BadStatusLine:
                 logging.warning("Service unavailable on %s", self.url)
             else:
-                if response.status == httplib.FOUND:
+                if response.status == http.client.FOUND:
                     # TODO prevent infinite redirect loop
                     self.url = response.getheader('location')
                     response = self.exchange(body, headers, timeout)
 
=== added file 'checkbox/lib/tz.py'
--- checkbox/lib/tz.py	1970-01-01 00:00:00 +0000
+++ checkbox/lib/tz.py	2012-06-23 00:59:17 +0000
@@ -0,0 +1,55 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+__all__ = [
+    "tzutc",
+    ]
+
+from datetime import (
+    timedelta,
+    tzinfo,
+    )
+
+
+ZERO = timedelta(0)
+
+
+class _tzutc(tzinfo):
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def dst(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def __eq__(self, other):
+        return isinstance(other, tzutc)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __repr__(self):
+        return "%s()" % self.__class__.__name__
+
+    __reduce__ = object.__reduce__
+
+
+tzutc = _tzutc()
 
=== modified file 'checkbox/lib/update.py'
--- checkbox/lib/update.py	2009-01-20 18:55:20 +0000
+++ checkbox/lib/update.py	2012-06-23 00:59:17 +0000
@@ -17,7 +17,7 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
 def recursive_update(dst, src):
-    irecursive_update(dst, list(src.iteritems()))
+    irecursive_update(dst, list(src.items()))
     return dst
 
 def irecursive_update(a, blist):
@@ -37,6 +37,6 @@
                 while not blist:
                     blist, a = stack.pop() # current <- parent
                 continue
-            blist, a = list(bv.iteritems()), a[bk]
+            blist, a = list(bv.items()), a[bk]
     except IndexError:
         pass
 
=== modified file 'checkbox/lib/url.py'
--- checkbox/lib/url.py	2009-08-19 15:36:05 +0000
+++ checkbox/lib/url.py	2012-06-23 00:59:17 +0000
@@ -16,11 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import urlparse
+import urllib.parse
 
 
 def parse_url(url):
-    scheme, host, path, params, query, fragment = urlparse.urlparse(url)
+    scheme, host, path, params, query, fragment = urllib.parse.urlparse(url)
 
     if "@" in host:
         username, host = host.rsplit("@", 1)
 
=== modified file 'checkbox/message.py'
--- checkbox/message.py	2012-02-23 11:56:50 +0000
+++ checkbox/message.py	2012-06-23 00:59:17 +0000
@@ -38,7 +38,7 @@
         self.filename = filename
 
 
-class MessageStore(object):
+class MessageStore:
     """A message store which stores its messages in a file system hierarchy."""
 
     #This caches everything but a message's data, making it manageable to keep in memory.
@@ -108,7 +108,7 @@
                 break
             try:
                 message = self._read_message(filename)
-            except ValueError, e:
+            except ValueError as e:
                 logging.exception(e)
                 self._add_flags(filename, BROKEN)
             else:
@@ -219,7 +219,7 @@
         return posixpath.join(self._directory, *args)
 
     def _get_content(self, filename):
-        file = open(filename)
+        file = open(filename, "rb")
         try:
             return file.read()
         finally:
@@ -263,7 +263,7 @@
 
         message_data = self._dump_message(message)
 
-        file = open(filename + ".tmp", "w")
+        file = open(filename + ".tmp", "wb")
         file.write(message_data)
         safe_close(file, safe=self.safe_file_closing)
 
 
=== modified file 'checkbox/parsers/cpuinfo.py'
--- checkbox/parsers/cpuinfo.py	2011-11-18 12:46:21 +0000
+++ checkbox/parsers/cpuinfo.py	2012-06-23 00:59:17 +0000
@@ -130,9 +130,9 @@
         processor["count"] = attributes.get("count", 1)
         bogompips_string = attributes.get("bogomips", "0.0")
         processor["bogomips"] = int(round(float(bogompips_string)))
-        for platform, conversion in platform_to_conversion.iteritems():
+        for platform, conversion in platform_to_conversion.items():
             if machine in platform:
-                for pkey, ckey in conversion.iteritems():
+                for pkey, ckey in conversion.items():
                     if isinstance(ckey, (list, tuple)):
                         processor[pkey] = "/".join([attributes[k]
                             for k in ckey])
@@ -141,9 +141,9 @@
 
         # Adjust platform
         if machine[0] == "i" and machine[-2:] == "86":
-            processor["platform"] = u"i386"
+            processor["platform"] = "i386"
         elif machine[:5] == "alpha":
-            processor["platform"] = u"alpha"
+            processor["platform"] = "alpha"
 
         # Adjust cache
         if processor["cache"]:
 
=== modified file 'checkbox/parsers/device.py'
--- checkbox/parsers/device.py	2011-06-13 14:22:39 +0000
+++ checkbox/parsers/device.py	2012-06-23 00:59:17 +0000
@@ -18,7 +18,7 @@
 #
 
 
-class DeviceResult(object):
+class DeviceResult:
 
     def addDevice(self, device):
         pass
 
=== modified file 'checkbox/parsers/dmidecode.py'
--- checkbox/parsers/dmidecode.py	2011-11-18 12:46:21 +0000
+++ checkbox/parsers/dmidecode.py	2012-06-23 00:59:17 +0000
@@ -20,7 +20,7 @@
 
 from string import (
     hexdigits,
-    uppercase,
+    ascii_uppercase,
     )
 
 from checkbox.lib.dmi import (
@@ -36,7 +36,7 @@
     % hexdigits)
 KEY_VALUE_RE = re.compile(
     r"^\t(?P<key>[%s].+):( (?P<value>.+))?$"
-    % uppercase)
+    % ascii_uppercase)
 
 
 class DmidecodeParser:
 
=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2012-02-10 11:19:05 +0000
+++ checkbox/parsers/submission.py	2012-06-23 00:59:17 +0000
@@ -21,7 +21,7 @@
 except ImportError:
     import cElementTree as etree
 
-from StringIO import StringIO
+from io import StringIO
 from logging import getLogger
 from pkg_resources import resource_string
 
@@ -103,7 +103,7 @@
             }
         parser = parsers.get(command)
         if parser:
-            if not isinstance(text, unicode):
+            if not isinstance(text, str):
                 text = text.decode("utf-8")
             stream = StringIO(text)
             p = parser(stream)
@@ -291,7 +291,7 @@
                 "Unexpected boolean value '%s' in <%s>" % (value, node.tag)
             return value == "True"
         elif type_ in ("str",):
-            return unicode(node.text.strip())
+            return str(node.text.strip())
         elif type_ in ("int", "long",):
             return int(node.text.strip())
         elif type_ in ("float",):
@@ -320,7 +320,7 @@
 
     def _getValueAsString(self, node):
         """Return the value of the attribute "value"."""
-        return unicode(node.attrib["value"])
+        return str(node.attrib["value"])
 
     def parseContext(self, result, node):
         """Parse the <context> part of a submission."""
@@ -354,7 +354,7 @@
                     parser(result, child)
                 else:
                     text = child.text
-                    if not isinstance(text, unicode):
+                    if not isinstance(text, str):
                         text = text.decode("utf-8")
                     stream = StringIO(text)
                     p = parser(stream)
@@ -389,11 +389,11 @@
 
             # Convert lists to space separated strings.
             properties = self._getProperties(child)
-            for key, value in properties.iteritems():
+            for key, value in properties.items():
                 if key in ("bogomips", "cache", "count", "speed",):
-                    properties[key] = int(value)
+                    properties[key] = int(float(value))
                 elif isinstance(value, list):
-                    properties[key] = u" ".join(value)
+                    properties[key] = " ".join(value)
             processors.append(properties)
 
         # Check if /proc/cpuinfo was parsed already.
@@ -403,15 +403,15 @@
             lines = []
             for processor in processors:
                 # Convert some keys with underscores to spaces instead.
-                for key, value in processor.iteritems():
+                for key, value in processor.items():
                     if "_" in key and key != "vendor_id":
                         key = key.replace("_", " ")
 
-                    lines.append(u"%s: %s" % (key, value))
-
-                lines.append(u"")
-
-            stream = StringIO(u"\n".join(lines))
+                    lines.append("%s: %s" % (key, value))
+
+                lines.append("")
+
+            stream = StringIO("\n".join(lines))
             parser = result.parseCpuinfo(stream)
             parser.run(result)
 
 
=== modified file 'checkbox/parsers/tests/cputable.py'
--- checkbox/parsers/tests/cputable.py	2012-02-15 00:11:21 +0000
+++ checkbox/parsers/tests/cputable.py	2012-06-23 00:59:17 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-from StringIO import StringIO
+from io import StringIO
 
 from unittest import TestCase
 
 
=== modified file 'checkbox/parsers/tests/description.py'
--- checkbox/parsers/tests/description.py	2012-02-15 00:11:21 +0000
+++ checkbox/parsers/tests/description.py	2012-06-23 00:59:17 +0000
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-from StringIO import StringIO
+from io import StringIO
 
 from unittest import TestCase
 
@@ -115,7 +115,7 @@
         self.assertResult(result)
 
     def test_es(self):
-        result = self.getResult(u"""
+        result = self.getResult("""
 PROPÓSITO:
      Esta prueba verifica los diferentes modos de vídeo detectados
 PASOS:
@@ -131,7 +131,7 @@
         self.assertEquals(result.info, "$output\n")
 
     def test_ru(self):
-        result = self.getResult(u"""
+        result = self.getResult("""
 ЦЕЛЬ:
     Эта проверка позволит убедиться в работоспособности штекера наушников
 ДЕЙСТВИЯ:
 
=== modified file 'checkbox/parsers/tests/dmidecode.py'
--- checkbox/parsers/tests/dmidecode.py	2012-02-15 00:11:21 +0000
+++ checkbox/parsers/tests/dmidecode.py	2012-06-23 00:59:17 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-from cStringIO import StringIO
+from io import StringIO
 
 from unittest import TestCase
 
 
=== modified file 'checkbox/parsers/tests/udevadm.py'
--- checkbox/parsers/tests/udevadm.py	2012-02-15 00:11:21 +0000
+++ checkbox/parsers/tests/udevadm.py	2012-06-23 00:59:17 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-from cStringIO import StringIO
+from io import StringIO
 
 from unittest import TestCase
 
 
=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-03-07 19:46:29 +0000
+++ checkbox/parsers/udevadm.py	2012-06-23 00:59:17 +0000
@@ -42,7 +42,7 @@
     r"^acpi:"
     r"(?P<vendor_name>[%(upper)s]{3})"
     r"(?P<product_id>[%(hex)s]{4}):"
-    % {"upper": string.uppercase, "hex": string.hexdigits})
+    % {"upper": string.ascii_uppercase, "hex": string.hexdigits})
 USB_RE = re.compile(
     r"^usb:"
     r"v(?P<vendor_id>[%(hex)s]{4})"
@@ -349,7 +349,7 @@
 
         # floppy
         if self.driver == "floppy":
-            return u"Platform Device"
+            return "Platform Device"
 
         return None
 
@@ -467,6 +467,4 @@
 
 
 def decode_id(id):
-    encoded_id = id.encode("utf-8")
-    decoded_id = encoded_id.decode("string-escape").decode("utf-8")
-    return decoded_id.strip()
+    return id.strip()
 
=== modified file 'checkbox/plugin.py'
--- checkbox/plugin.py	2010-03-09 16:58:36 +0000
+++ checkbox/plugin.py	2012-06-23 00:59:17 +0000
@@ -40,7 +40,7 @@
                 module.register(self)
 
 
-class Plugin(object):
+class Plugin:
     """
     Plugin base class which should be inherited by each plugin
     implementation. This class extends the component to automatically
 
=== modified file 'checkbox/properties.py'
--- checkbox/properties.py	2011-03-17 11:15:12 +0000
+++ checkbox/properties.py	2012-06-23 00:59:17 +0000
@@ -17,13 +17,13 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
 from checkbox.attribute import Attribute
-from checkbox.variables import (ConstantVariable, BoolVariable, StringVariable,
-    PathVariable, UnicodeVariable, IntVariable, FloatVariable, TimeVariable,
+from checkbox.variables import (ConstantVariable, BoolVariable, BytesVariable,
+    StringVariable, PathVariable, IntVariable, FloatVariable, TimeVariable,
     ListVariable, TupleVariable, AnyVariable, DictVariable, MapVariable,
     FileVariable, VariableFactory, Variable, get_variable)
 
 
-class Property(object):
+class Property:
 
     def __init__(self, variable_class=Variable, variable_kwargs={}):
         self._variable_class = variable_class
@@ -47,7 +47,7 @@
     def _detect_name(self, used_cls):
         self_id = id(self)
         for cls in used_cls.__mro__:
-            for attr, prop in cls.__dict__.iteritems():
+            for attr, prop in cls.__dict__.items():
                 if id(prop) == self_id:
                     return attr
         raise RuntimeError("Property used in an unknown class")
@@ -116,6 +116,11 @@
     variable_class = BoolVariable
 
 
+class Bytes(PropertyType):
+
+    variable_class = BytesVariable
+
+
 class String(PropertyType):
 
     variable_class = StringVariable
@@ -126,11 +131,6 @@
     variable_class = PathVariable
 
 
-class Unicode(PropertyType):
-
-    variable_class = UnicodeVariable
-
-
 class Int(PropertyType):
 
     variable_class = IntVariable
@@ -188,7 +188,7 @@
     variable_class = MapVariable
 
     def __init__(self, schema={}, **kwargs):
-        for key, type in schema.iteritems():
+        for key, type in schema.items():
             schema[key] = VariableFactory(type._variable_class,
                 **type._variable_kwargs)
 
 
=== modified file 'checkbox/reactor.py'
--- checkbox/reactor.py	2011-02-14 18:19:27 +0000
+++ checkbox/reactor.py	2012-06-23 00:59:17 +0000
@@ -22,7 +22,7 @@
 from checkbox.lib.log import format_object
 
 
-class EventID(object):
+class EventID:
 
     def __init__(self, event_type, pair):
         self._event_type = event_type
@@ -39,7 +39,7 @@
     pass
 
 
-class Reactor(object):
+class Reactor:
 
     def __init__(self):
         self._event_handlers = {}
@@ -99,7 +99,7 @@
         if type(id) is EventID:
             self._event_handlers[id._event_type].remove(id._pair)
         else:
-            raise Exception, "EventID instance expected, received %r" % id
+            raise Exception("EventID instance expected, received %r" % id)
 
     def cancel_all_calls(self, event_type):
         del self._event_handlers[event_type]
 
=== modified file 'checkbox/report.py'
--- checkbox/report.py	2011-09-14 21:16:02 +0000
+++ checkbox/report.py	2012-06-23 00:59:17 +0000
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import libxml2
 import posixpath
 
+from lxml import etree
 from xml.dom.minidom import Document, Element, parseString
 
 
-class ReportManager(object):
+class ReportManager:
     """The central point for dumping and loading information.
 
     This keeps references to all reports which have been added to the
@@ -43,7 +43,7 @@
         Call back method for reports to register dump handlers.
         """
         if type in self.dumps_table:
-            raise Exception, "Dumps type already handled: %s" % type
+            raise Exception("Dumps type already handled: %s" % type)
         self.dumps_table[type] = handler
 
     def handle_loads(self, type, handler):
@@ -51,7 +51,7 @@
         Call back method for reports to register load handlers.
         """
         if type in self.loads_table:
-            raise Exception, "Loads type already handled: %s" % type
+            raise Exception("Loads type already handled: %s" % type)
         self.loads_table[type] = handler
 
     def call_dumps(self, obj, node):
@@ -66,7 +66,7 @@
         Convenience method for reports to call the load handler
         corresponding to the content of the given node.
         """
-        if self.loads_table.has_key(node.localName):
+        if node.localName in self.loads_table:
             ret = self.loads_table[node.localName](node)
         elif isinstance(node, Element) and node.hasAttribute("type"):
             type = node.getAttribute("type")
@@ -103,30 +103,30 @@
 
         try:
             self.call_dumps(obj, node)
-        except KeyError, e:
-            raise ValueError, "Unsupported type: %s" % e
+        except KeyError as e:
+            raise ValueError("Unsupported type: %s" % e)
 
         return document
 
-    def loads(self, str):
+    def loads(self, string):
         """
         Load the given string which may be a container of any nodes
         supported by the reports added to the manager.
         """
-        document = parseString(str)
+        document = parseString(string)
         node = document.childNodes[0]
         assert(node.localName == self.name)
 
         try:
             ret = self.call_loads(document)
-        except KeyError, e:
-            raise ValueError, "Unsupported type: %s" % e
+        except KeyError as e:
+            raise ValueError("Unsupported type: %s" % e)
 
         return ret
 
-    def validate(self, str):
+    def validate(self, string):
         """
-        Validate the given string 
+        Validate the given string
         """
         if not self.schema:
             return False
@@ -137,21 +137,14 @@
         finally:
             file.close()
 
-        rngParser = libxml2.relaxNGNewMemParserCtxt(schema, len(schema))
-        rngSchema = rngParser.relaxNGParse()
-        ctxt = rngSchema.relaxNGNewValidCtxt()
-        doc = libxml2.parseDoc(str)
-        is_valid = doc.relaxNGValidateDoc(ctxt)
-
-        # Clean up
-        doc.freeDoc()
-        del rngParser, rngSchema, ctxt
-        libxml2.relaxNGCleanupTypes()
-        libxml2.cleanupParser()
-        return is_valid == 0
-
-
-class Report(object):
+        relaxng_doc = etree.fromstring(schema)
+        relaxng = etree.RelaxNG(relaxng_doc)
+
+        doc = etree.fromstring(string)
+        return relaxng.validate(doc)
+
+
+class Report:
     """A convenience for writing reports.
 
     This provides a register method which will set the manager attribute
 
=== modified file 'checkbox/reports/launchpad_report.py'
--- checkbox/reports/launchpad_report.py	2010-03-09 16:58:36 +0000
+++ checkbox/reports/launchpad_report.py	2012-06-23 00:59:17 +0000
@@ -109,7 +109,7 @@
 
     def dumps_lsbrelease(self, obj, parent):
         logging.debug("Dumping lsbrelease")
-        for key, value in obj.iteritems():
+        for key, value in obj.items():
             property = self._create_element("property", parent)
             property.setAttribute("name", key)
             self._manager.call_dumps(value, property)
 
=== modified file 'checkbox/reports/xml_report.py'
--- checkbox/reports/xml_report.py	2010-03-09 16:58:36 +0000
+++ checkbox/reports/xml_report.py	2012-06-23 00:59:17 +0000
@@ -36,10 +36,9 @@
     def register_dumps(self):
         for (dt, dh) in [(bool, self.dumps_bool),
                          (int, self.dumps_int),
-                         (long, self.dumps_int),
                          (float, self.dumps_float),
+                         (bytes, self.dumps_bytes),
                          (str, self.dumps_str),
-                         (unicode, self.dumps_unicode),
                          (list, self.dumps_list),
                          (tuple, self.dumps_list),
                          (dict, self.dumps_dict),
@@ -52,8 +51,8 @@
                          ("int", self.loads_int),
                          ("long", self.loads_int),
                          ("float", self.loads_float),
+                         ("bytes", self.loads_bytes),
                          ("str", self.loads_str),
-                         ("unicode", self.loads_str),
                          ("list", self.loads_list),
                          ("value", self.loads_value),
                          ("property", self.loads_property),
@@ -78,12 +77,12 @@
     def dumps_float(self, obj, parent):
         self._dumps_text(str(obj), parent, "float")
 
+    def dumps_bytes(self, obj, parent):
+        self._dumps_text(obj, parent, "bytes")
+
     def dumps_str(self, obj, parent):
         self._dumps_text(obj, parent, "str")
 
-    def dumps_unicode(self, obj, parent):
-        self._dumps_text(obj, parent, "unicode")
-
     def dumps_list(self, obj, parent):
         parent.setAttribute("type", "list")
         for value in obj:
@@ -92,9 +91,9 @@
             self._manager.call_dumps(value, element)
 
     def dumps_dict(self, obj, parent):
-        for key in sorted(obj.iterkeys()):
+        for key in sorted(obj.keys()):
             value = obj[key]
-            if self._manager.dumps_table.has_key(key):
+            if key in self._manager.dumps_table:
                 # Custom dumps handler
                 element = self._create_element(key, parent)
                 self._manager.dumps_table[key](value, element)
@@ -130,8 +129,11 @@
     def loads_float(self, node):
         return float(node.data)
 
+    def loads_bytes(self, node):
+        return node.data.strip().encode("utf-8")
+
     def loads_str(self, node):
-        return str(node.data.strip())
+        return node.data.strip()
 
     def loads_list(self, node):
         nodes = []
@@ -188,4 +190,4 @@
     elif re.match('^(no|false|0)$', string, re.IGNORECASE):
         return False
     else:
-        raise Exception, "Invalid boolean type: %s" % string
+        raise Exception("Invalid boolean type: %s" % string)
 
=== modified file 'checkbox/resource.py'
--- checkbox/resource.py	2011-06-21 13:57:25 +0000
+++ checkbox/resource.py	2012-06-23 00:59:17 +0000
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import __builtin__
+import builtins
 
 
 __all__ = ["ResourceMap"]
 
 
-class ResourceObject(object):
+class ResourceObject:
     __slots__ = ("_iterator", "_name", "_convert",)
 
     def __init__(self, iterator, name, convert=lambda x: x):
@@ -67,7 +67,7 @@
         return until if found else default
 
 
-class ResourceIterator(object):
+class ResourceIterator:
     __slots__ = ("_map", "_values",)
 
     def __init__(self, map, values):
@@ -91,7 +91,7 @@
         return ResourceObject(self, name)
 
 
-class ResourceBuiltin(object):
+class ResourceBuiltin:
     __slots__ = ("_function",)
 
     def __init__(self, function):
@@ -105,10 +105,9 @@
 
     def __init__(self, names, *args, **kwargs):
         super(ResourceGlobals, self).__init__(*args, **kwargs)
-        self["__builtins__"] = None
 
         for name in names:
-            function = getattr(__builtin__, name)
+            function = getattr(builtins, name)
             self[name] = ResourceBuiltin(function)
 
 
@@ -128,7 +127,7 @@
 
     def eval(self, source):
         self._results = []
-        resource_globals = ResourceGlobals(["bool", "float", "int", "long", "str"])
+        resource_globals = ResourceGlobals(["bool", "float", "int", "str"])
         try:
             value = eval(source, resource_globals, self)
             if (isinstance(value, (bool, int)) and value) \
 
=== modified file 'checkbox/tests/report.py'
--- checkbox/tests/report.py	2011-09-14 21:16:02 +0000
+++ checkbox/tests/report.py	2012-06-23 00:59:17 +0000
@@ -105,5 +105,5 @@
         self.assertTrue("test1" in str)
 
         data = rm.loads(str)
-        self.assertTrue(data.has_key("test"))
+        self.assertTrue("test" in data)
         self.assertTrue(data["test"] == "test1")
 
=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2012-03-21 02:22:11 +0000
+++ checkbox/user_interface.py	2012-06-23 00:59:17 +0000
@@ -57,8 +57,12 @@
     UNSUPPORTED: SKIP_ANSWER,
     UNTESTED: SKIP_ANSWER}
 
-
-class UserInterface(object):
+CONTINUE_ANSWER = 'Continue'
+RERUN_ANSWER = 'Rerun'
+RESTART_ANSWER = 'Restart'
+
+
+class UserInterface:
     """Abstract base class for encapsulating the workflow and common code for
        any user interface implementation (like GTK, Qt, or CLI).
 
@@ -67,6 +71,7 @@
     def __init__(self, title, data_path=None):
         self.title = title
         self.data_path = data_path
+        self.progress = None
         self.ui_flags = {}
 
         self.report_url = None
@@ -78,9 +83,12 @@
         logging.info(text)
         return default
 
-    def show_error(self, text):
+    def show_error(self, primary_text,
+                   secondary_text=None, detailed_text=None):
+        text = filter(None, [primary_text, secondary_text, detailed_text])
+        text = '\n'.join(text)
         logging.error(text)
-        raise StopAllException, "Error: %s" % text
+        raise StopAllException("Error: %s" % text)
 
     def show_progress(self, message, function, *args, **kwargs):
         self.show_progress_start(message)
@@ -109,7 +117,7 @@
     def show_text(self, text, previous=None, next=None):
         return
 
-    def show_entry(self, text, value, previous=None, next=None):
+    def show_entry(self, text, value, label=None, previous=None, next=None):
         return value
 
     def show_check(self, text, options=[], default=[]):
@@ -118,7 +126,7 @@
     def show_radio(self, text, options=[], default=None):
         return default
 
-    def show_tree(self, text, options={}, default={}):
+    def show_tree(self, text, options={}, default={}, deselect_warning=""):
         return default
 
     def show_test(self, test, runner):
@@ -194,7 +202,7 @@
             webbrowser.open(url, new=True, autoraise=True)
             return
 
-        except Exception, e:
+        except Exception as e:
             pass
 
     def show_report(self, text, results):
@@ -203,3 +211,13 @@
         and make it possible to modify them
         """
         raise NotImplementedError
+
+    def update_status(self, job):
+        """
+        If implemented, it will be called after each job finishes.
+        The passed Job object can be used to update in-UI status
+        about each job.
+        """
+        pass
+        
+
 
=== modified file 'checkbox/variables.py'
--- checkbox/variables.py	2011-09-14 21:16:02 +0000
+++ checkbox/variables.py	2012-06-23 00:59:17 +0000
@@ -19,7 +19,7 @@
 import re
 import posixpath
 
-from StringIO import StringIO
+from io import StringIO
 
 from checkbox.lib.text import split
 
@@ -47,7 +47,7 @@
     pass
 
 
-class Variable(object):
+class Variable:
 
     _value = None
     _required = True
@@ -101,7 +101,7 @@
     __slots__ = ()
 
     def coerce(self, value):
-        if isinstance(value, (str, unicode)):
+        if isinstance(value, str):
             if re.match(r"(yes|true)", value, re.IGNORECASE):
                 value = True
             elif re.match(r"(no|false)", value, re.IGNORECASE):
@@ -114,12 +114,24 @@
         return value
 
 
+class BytesVariable(Variable):
+    __slots__ = ()
+
+    def coerce(self, value):
+        if isinstance(value, str):
+            value = value.encode('utf-8')
+        elif not isinstance(value, bytes):
+            raise ValueError("%r is not bytes" % (value,))
+
+        return value
+
+
 class StringVariable(Variable):
     __slots__ = ()
 
     def coerce(self, value):
-        if isinstance(value, unicode):
-            value = str(value)
+        if isinstance(value, bytes):
+            value = value.decode("utf-8")
         elif not isinstance(value, str):
             raise ValueError("%r is not a str" % (value,))
 
@@ -134,25 +146,13 @@
         return posixpath.expanduser(path)
 
 
-class UnicodeVariable(Variable):
-    __slots__ = ()
-
-    def coerce(self, value):
-        if isinstance(value, str):
-            value = unicode(value, encoding="utf-8")
-        elif not isinstance(value, unicode):
-            raise ValueError("%r is not a unicode" % (value,))
-
-        return value
-
-
 class IntVariable(Variable):
     __slots__ = ()
 
     def coerce(self, value):
-        if isinstance(value, (str, unicode)):
+        if isinstance(value, str):
             value = int(value)
-        elif not isinstance(value, (int, long)):
+        elif not isinstance(value, int):
             raise ValueError("%r is not an int nor long" % (value,))
 
         return value
@@ -162,9 +162,9 @@
     __slots__ = ()
 
     def coerce(self, value):
-        if isinstance(value, (str, unicode)):
+        if isinstance(value, str):
             value = float(value)
-        elif not isinstance(value, (int, long, float)):
+        elif not isinstance(value, (int, float)):
             raise ValueError("%r is not a float" % (value,))
 
         return value
@@ -186,7 +186,7 @@
 
     def coerce(self, values):
         item_factory = self._item_factory
-        if isinstance(values, (str, unicode)):
+        if isinstance(values, str):
             values = split(values, self._separator) if values else []
         elif not isinstance(values, (list, tuple)):
             raise ValueError("%r is not a list or tuple" % (values,))
@@ -235,7 +235,7 @@
         if not isinstance(value, dict):
             raise ValueError("%r is not a dict." % (value,))
 
-        for k, v in value.iteritems():
+        for k, v in value.items():
             value[self._key_schema(value=k).get()] = \
                 self._value_schema(value=v).get()
         return value
@@ -252,16 +252,16 @@
         if not isinstance(value, dict):
             raise ValueError("%r is not a dict." % (value,))
 
-        for k, v in value.iteritems():
+        for k, v in value.items():
             if k not in self._schema:
                 raise ValueError("%r is not a valid key as per %r"
                                    % (k, self._schema))
 
-        for attribute, variable in self._schema.iteritems():
+        for attribute, variable in self._schema.items():
             old_value = value.get(attribute)
             try:
                 new_value = variable(value=old_value).get()
-            except ValueError, e:
+            except ValueError as e:
                 raise ValueError(
                     "Value of %r key of dict %r could not be converted: %s"
                     % (attribute, value, e))
@@ -276,7 +276,7 @@
     __slots__ = ()
 
     def coerce(self, value):
-        if isinstance(value, basestring):
+        if isinstance(value, str):
             value = StringIO(value)
         elif not hasattr(value, "read"):
             raise ValueError("%r is not a file" % (value,))
@@ -295,7 +295,7 @@
     else:
         variables = {}
         cls = type(obj)
-        for attribute in get_attributes(cls).itervalues():
+        for attribute in get_attributes(cls).values():
             variable = attribute.variable_factory(attribute=attribute)
             variables[attribute] = variable
 
 
=== modified file 'checkbox_cli/cli_interface.py'
--- checkbox_cli/cli_interface.py	2012-02-23 11:56:50 +0000
+++ checkbox_cli/cli_interface.py	2012-06-23 00:59:17 +0000
@@ -35,7 +35,7 @@
 OPTION_TO_ANSWER = dict((o, a) for a, o in ANSWER_TO_OPTION.items())
 
 
-class CLIDialog(object):
+class CLIDialog:
     """Command line dialog wrapper."""
 
     def __init__(self, text):
@@ -44,6 +44,7 @@
 
     def put(self, text):
         sys.stdout.write(text)
+        sys.stdout.flush()
 
     def put_line(self, line):
         self.put("%s\n" % line)
@@ -59,7 +60,7 @@
         fileno = sys.stdin.fileno()
         saved_attributes = termios.tcgetattr(fileno)
         attributes = termios.tcgetattr(fileno)
-        attributes[3] = attributes[3] & ~(termios.ICANON | termios.ECHO)
+        attributes[3] &= ~(termios.ICANON | termios.ECHO)
         attributes[6][termios.VMIN] = 1
         attributes[6][termios.VTIME] = 0
         termios.tcsetattr(fileno, termios.TCSANOW, attributes)
@@ -68,12 +69,12 @@
         escape = 0
         try:
             while len(input) < limit:
-                ch = str(sys.stdin.read(1))
+                ch = sys.stdin.read(1)
                 if ord(ch) == separator:
                     break
-                elif ord(ch) == 033: # ESC
+                elif ord(ch) == 0o33:  # ESC
                     escape = 1
-                elif ord(ch) == termios.CERASE or ord(ch) == 010:
+                elif ord(ch) == termios.CERASE or ord(ch) == 0o10:
                     if len(input):
                         self.put("\010 \010")
                         del input[-1]
@@ -186,7 +187,7 @@
         that is, a job containing other jobs
         """
         return all(issubclass(type(value), dict)
-                   for value in root.itervalues())
+                   for value in root.values())
 
     def _display(self, title, root):
         """
@@ -208,11 +209,11 @@
                 if not provided
                 """
                 if key is None:
-                    key = string.lowercase[len(keys)]
+                    key = string.ascii_lowercase[len(keys)]
                 keys.append(key)
                 options.append(option)
 
-            for job_name, job_data in sorted(root.iteritems()):
+            for job_name, job_data in sorted(root.items()):
                 if self._is_suite(job_data):
                     add_option(job_name)
                     self.put_line('{key}: {option}'
@@ -300,7 +301,7 @@
             elif key in options:
                 if isinstance(options[key], dict):
                     results[key] = {}
-                elif isinstance(options[key], (list, tuple,)):
+                elif isinstance(options[key], (list, tuple)):
                     results[key] = []
                 else:
                     results[key] = None
@@ -308,7 +309,7 @@
                 for k in options[key]:
                     self._toggle_results(k, options[key], results[key])
 
-        elif isinstance(results, (list, tuple,)):
+        elif isinstance(results, (list, tuple)):
             if key in results:
                 results.remove(key)
             elif key in options:
@@ -325,7 +326,7 @@
         dialog = CLIChoiceDialog(text)
         dialog.run()
 
-    def show_entry(self, text, value, previous=None, next=None):
+    def show_entry(self, text, value, label=None, previous=None, next=None):
         dialog = CLILineDialog(text)
 
         return dialog.run()
@@ -357,7 +358,7 @@
         response = dialog.run()
         return options[response]
 
-    def show_tree(self, text, options={}, default={}):
+    def show_tree(self, text, options={}, default={}, deselect_warning=""):
         keys = sorted(options.keys())
 
         dialog = CLIChoiceDialog(text)
@@ -453,6 +454,9 @@
     def show_info(self, text, options=[], default=None):
         return self.show_radio(text, options, default)
 
-    def show_error(self, text):
+    def show_error(self, primary_text,
+                   secondary_text=None, detailed_text=None):
+        text = filter(None, [primary_text, secondary_text, detailed_text])
+        text = '\n'.join(text)
         dialog = CLIChoiceDialog("Error: %s" % text)
         dialog.run()
 
=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2012-02-23 11:56:50 +0000
+++ checkbox_gtk/gtk_interface.py	2012-06-23 00:59:17 +0000
@@ -47,7 +47,7 @@
 
 # HACK: Setting and unsetting previous and next buttons to workaround
 #       for gnome bug #56070.
-class GTKHack(object):
+class GTKHack:
     def __init__(self, function):
         self._function = function
 
@@ -211,6 +211,19 @@
             title += " - %s" % test_name
         self._get_widget("dialog_main").set_title(title)
 
+    def _set_progress(self,progress):
+        # Update progress bar
+        bar = self._get_widget("progressbar_test")
+        if not self.progress: 
+            return
+        done, total = self.progress
+        bar.set_text("%(done)d/%(total)d" % {'done': done, 'total': total})
+        if total:
+            progress_fraction = float(done) / total
+        else:
+            progress_fraction=0
+        bar.set_fraction(progress_fraction)
+
     def _run_dialog(self, dialog=None):
         def on_dialog_response(dialog, response, self):
             # Keep dialog alive when the button that has been clicked
@@ -221,8 +234,16 @@
                 self.direction = response
                 Gtk.main_quit()
 
+        def on_dialog_key_press(dialog, event, self):
+            # Ignore ESC key presses
+            key = Gdk.keyval_name(event.keyval)
+            if "Escape" in key:
+                return True
+            return False
+
         dialog = dialog or self._dialog
         dialog.connect("response", on_dialog_response, self)
+        dialog.connect("key-press-event", on_dialog_key_press, self)
         dialog.set_default_response(NEXT)
         dialog.show()
         Gtk.main()
@@ -230,6 +251,7 @@
             raise KeyboardInterrupt
 
     def show_progress_start(self, message):
+        self._set_progress(self.progress)
         self._set_sensitive("button_previous", False)
         self._set_sensitive("button_next", False)
 
@@ -266,7 +288,7 @@
         self._set_button("button_next", next_state)
 
     @GTKHack
-    def show_entry(self, text, value, previous=None, next=None):
+    def show_entry(self, text, value, label=None, previous=None, next=None):
         #Reset window title
         self._set_main_title()
         # Set buttons
@@ -315,7 +337,7 @@
 
         # Set callbacks
         def click_button(widget, active):
-            for check_button in option_table.itervalues():
+            for check_button in option_table.values():
                 check_button.set_active(active)
 
         for button_name in "button_select_all", "button_deselect_all":
@@ -375,11 +397,11 @@
         return result
 
     @GTKHack
-    def show_tree(self, text, options={}, default={}):
+    def show_tree(self, text, options={}, default={}, deselect_warning=""):
         #Reset window title
         self._set_main_title()
 
-        (COLUMN_TEXT, COLUMN_ACTIVE) = range(2)
+        (COLUMN_TEXT, COLUMN_ACTIVE) = list(range(2))
 
         # Set buttons
         self._notebook.set_current_page(1)
@@ -519,6 +541,7 @@
             self._set_hyper_text_view("hyper_text_view_test",
                 test["description"])
 
+        self._set_progress(self.progress) 
         # Set buttons
         if "command" in test:
             self._set_sensitive("button_test", True)
@@ -566,15 +589,35 @@
         self.direction = NEXT
         return options[response]
 
-    def show_error(self, text):
+    def show_error(self, primary_text,
+                   secondary_text=None, detailed_text=None):
         message_dialog = Gtk.MessageDialog(parent=self._dialog,
             type=Gtk.MessageType.ERROR,
             buttons=Gtk.ButtonsType.NONE,
-            message_format=text)
+            message_format=primary_text)
         message_dialog.set_modal(True)
         message_dialog.set_title(_("Error"))
         message_dialog.set_default_response(NEXT)
         message_dialog.add_buttons(Gtk.STOCK_CLOSE, NEXT)
+        if secondary_text:
+            message_dialog.format_secondary_text(secondary_text)
+        if detailed_text:
+            content_area = message_dialog.get_content_area()
+
+            expander = Gtk.Expander(label=_('Detailed information...'))
+
+            def expanded_cb(expander, *args):
+                message_dialog.set_resizable(expander.get_expanded())
+            expander.connect("notify::expanded", expanded_cb)
+            scrolled_window = Gtk.ScrolledWindow()
+            textview = Gtk.TextView()
+            textview.set_editable(False)
+            textview.get_buffer().set_text(detailed_text)
+            scrolled_window.add(textview)
+            expander.add(scrolled_window)
+            content_area.pack_start(expander,
+                                    expand=True, fill=True, padding=0)
+        message_dialog.show_all()
         self._run_dialog(message_dialog)
         message_dialog.hide()
 
 
=== modified file 'checkbox_gtk/hyper_text_view.py'
--- checkbox_gtk/hyper_text_view.py	2011-09-14 21:16:02 +0000
+++ checkbox_gtk/hyper_text_view.py	2012-06-23 00:59:17 +0000
@@ -32,13 +32,13 @@
         try:
             return getattr(self, prop.name)
         except AttributeError:
-            raise AttributeError, "unknown property %s" % prop.name
+            raise AttributeError("unknown property %s" % prop.name)
 
     def do_set_property(self, prop, val):
-        if prop.name in self.__gproperties__.keys():
+        if prop.name in list(self.__gproperties__.keys()):
             setattr(self, prop.name, val)
         else:
-            raise AttributeError, "unknown property %s" % prop.name
+            raise AttributeError("unknown property %s" % prop.name)
 
     def __init__(self, buffer=None):
         super(HyperTextView, self).__init__(buffer=buffer)
@@ -55,12 +55,10 @@
         self.connect("focus-out-event", lambda w, e: self.get_buffer().get_tag_table().foreach(self.__tag_reset, e.window))
 
     def insert(self, text, _iter=None):
-        if not isinstance(text, unicode):
-            text = unicode(text, "utf-8")
         b = self.get_buffer()
         if _iter is None:
             _iter = b.get_end_iter()
-        b.insert(_iter, text.encode("utf-8"))
+        b.insert(_iter, text)
 
     def insert_with_anchor(self, text, anchor=None, _iter=None):
         b = self.get_buffer()
@@ -109,7 +107,7 @@
 
     def __set_anchor(self, window, tag, cursor, prop):
         window.set_cursor(cursor)
-        for key, val in prop.iteritems():
+        for key, val in prop.items():
             if val is not None:
                 tag.set_property(key, val)
 
 
=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-04-11 17:20:37 +0000
+++ checkbox_qt/qt_interface.py	2012-06-23 00:59:17 +0000
@@ -16,20 +16,17 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import sys
+import re
 import time
-import posixpath
-import inspect
 from gi.repository import GObject
-import os
 
 from gettext import gettext as _
 from string import Template
 
-from checkbox.job import PASS 
+from checkbox.job import PASS
 from checkbox.user_interface import (UserInterface,
     NEXT, PREV, YES_ANSWER, NO_ANSWER, SKIP_ANSWER,
-    ANSWER_TO_STATUS, STATUS_TO_ANSWER)
+    ANSWER_TO_STATUS)
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 
@@ -40,30 +37,41 @@
 
 OPTION_TO_ANSWER = dict((o, a)
                         for a, o in ANSWER_TO_OPTION.items())
+def dummy_handle_reply(r=None):
+    return
+
+def dummy_handle_error(e=None):
+    return
 
 class QTInterface(UserInterface):
     def __init__(self, title, data_path):
         super(QTInterface, self).__init__(title, data_path)
         self._app_title = title
         notReady = True
+        infoResult = None
         while notReady:
             try:
                 self.bus = dbus.SessionBus(mainloop=DBusGMainLoop())
-                self.qtfront = self.bus.get_object('com.canonical.QtCheckbox', '/QtCheckbox')
-                self.qtiface = dbus.Interface(self.qtfront, dbus_interface='com.canonical.QtCheckbox')
+                self.qtfront = self.bus.get_object(
+                    'com.canonical.QtCheckbox', '/QtCheckbox')
+                self.qtiface = dbus.Interface(
+                    self.qtfront, dbus_interface='com.canonical.QtCheckbox')
                 self.loop = GObject.MainLoop()
                 notReady = False
             except:
                 time.sleep(0.5)
-        self.bus.add_signal_receiver(self.onClosedFrontend, "closedFrontend")
-        self.bus.add_signal_receiver(self.onReviewTestsClicked, "reviewTestsClicked")
-        self.bus.add_signal_receiver(self.onWelcomeCheckboxToggled, "welcomeCheckboxToggled")
+        self.bus.add_signal_receiver(
+            self.onClosedFrontend, "closedFrontend")
+        self.bus.add_signal_receiver(
+            self.onReviewTestsClicked, "reviewTestsClicked")
+        self.bus.add_signal_receiver(
+            self.onWelcomeCheckboxToggled, "welcomeCheckboxToggled")
+        self.qtiface.setInitialState()
 
-        self.qtiface.setInitialState();
         self._set_main_title()
 
     def onReviewTestsClicked(self):
-        self.show_url(self.report_url) 
+        self.show_url(self.report_url)
 
     def onWelcomeCheckboxToggled(self, checked):
         self.ui_flags["show_welcome_message"] = bool(checked)
@@ -95,8 +103,10 @@
         def onFullTestsClicked():
             self.direction = NEXT
             self.loop.quit()
+
         def onCustomTestsClicked():
             self.loop.quit()
+
         #Reset window title
         self._set_main_title()
 
@@ -106,13 +116,25 @@
         self.qtiface.showText(text)
         self.wait_on_signals(fullTestsClicked=onFullTestsClicked)
 
-    def show_entry(self, text, value, previous=None, next=None):
+    def show_entry(self, text, value, label='', previous=None, next=None):
         def onSubmitTestsClicked():
             self.loop.quit()
 
-        self.qtiface.showEntry(text)
+        # Replace links wiki style markup with html markup
+        text = '<html>{}</html>'.format(text)
+        text = text.replace('\n', '<br/>')
+        text = re.sub(r'\[\[([^|]*)\|([^\]]*)\]\]',
+                      lambda m: '<a href="{}">{}</a>'
+                                .format(m.group(1), m.group(2)),
+                      text)
+
+        # Make sure that value is a string
+        if value is None:
+            value = ''
+
+        self.qtiface.showEntry(text, value, label)
         self.wait_on_signals(submitTestsClicked=onSubmitTestsClicked)
-        return self.qtiface.getEmailAddress()
+        return self.qtiface.getSubmissionData()
 
     def show_check(self, text, options=[], default=[]):
         return False
@@ -120,43 +142,57 @@
     def show_radio(self, text, options=[], default=None):
         return False
 
-    def show_tree(self, text, options={}, default={}):
+    def show_tree(self, text, options={}, default={}, deselect_warning=""):
+        indexedOptions = {}
+        indexedDefaults = {}
+
         def onStartTestsClicked():
             self.direction = NEXT
             self.loop.quit()
 
-        def onWelcomeClicked():
-            self.direction = PREV
-            self.loop.quit()
+        def buildBranch(options, default, baseIndex="1"):
+            internalIndex = 1
+            for test, state in options.items():
+                active = test in default
+                if isinstance(state, dict):
+                    indexedOptions[
+                        baseIndex + "." + str(internalIndex)] = {test: ''}
+                    indexedDefaults[
+                        baseIndex + "." + str(internalIndex)] = {test: active}
+                    buildBranch(state, default.get(test, {}), baseIndex + "." + str(internalIndex))
+                else:
+                    indexedOptions[
+                        baseIndex + "." + str(internalIndex)] = {test: state}
+                    indexedDefaults[
+                        baseIndex + "." + str(internalIndex)] = {test: active}
+                internalIndex += 1
+
+        def buildDict(options, baseIndex="1"):
+            internalIndex = 1
+            branch = {}
+            while True:
+                currentIndex = baseIndex + "." + str(internalIndex)
+                if currentIndex in options:
+                    key = list(options[currentIndex].keys())[0]
+                    value = list(options[currentIndex].values())[0]
+                    if value == "menu":
+                        branch[key] = buildDict(options, currentIndex)
+                    else:
+                        branch[key] = value
+                    internalIndex += 1
+                else:
+                    break
+            return branch
 
         self._set_main_title()
-        newOptions = {}
-        for section in options:
-            newTests = {}
-            for test, state in options[section].iteritems():
-                # TODO: add support for more than one level
-                if not isinstance(state, dict):
-                    newTests[str(test)] = state
-
-            if newTests == {}:
-                newTests = {'': ''}
-
-            newOptions[section] = newTests
-
-        self.qtiface.showTree(text, newOptions)
+        buildBranch(options, default)
+
+        self.qtiface.showTree(text, indexedOptions, indexedDefaults,
+                              deselect_warning)
         self.wait_on_signals(
             startTestsClicked=onStartTestsClicked)
 
-        newOptions = {}
-        testsFromInterface = self.qtiface.getTestsToRun()
-        for section in testsFromInterface:
-            newTests = {}
-            for test in testsFromInterface[section]:
-                if test != '':
-                    newTests[str(test)] = {}
-            newOptions[str(section)] = newTests
-
-        return newOptions
+        return buildDict(self.qtiface.getTestsToRun())
 
     def _run_test(self, test, runner):
         self.qtiface.showTestControls(False)
@@ -164,8 +200,12 @@
         self.qtiface.setFocusTestYesNo(True if status == PASS else False)
         self.qtiface.showTestControls(True)
 
-        return Template(test["info"]).substitute({
-            "output": data.strip()})
+        if test["info"]:
+            info = Template(test["info"]).substitute({"output": data.strip()})
+        else:
+            info = ""
+
+        return info
 
     def show_test(self, test, runner):
         def onStartTestClicked():
@@ -200,7 +240,7 @@
         if not "data" in test:
             test["data"] = ""
         if "command" in test:
-            enableTestButton = True    
+            enableTestButton = True
 
         self.qtiface.showTest(
             test["purpose"], test["steps"], test["verification"], info, test["data"],
@@ -217,33 +257,44 @@
 
     def show_info(self, text, options=[], default=None):
         def onInfoBoxResult(result):
+            #result here will always be a dbus String
+            #it may not be convertable with str due to the fact that it
+            #may contain non-ascii characters, so we need to convert to
+            #internal Python unicode instead.
             self.infoResult = str(result)
             self.loop.quit()
 
-        self.qtiface.showInfo(text, options, default, 
+        self.qtiface.showInfo(
+            text, options, default,
             reply_handler=dummy_handle_reply,
             error_handler=dummy_handle_error)
         self.wait_on_signals(
             infoBoxResult=onInfoBoxResult)
         return self.infoResult
 
-    def show_error(self, text):
+    def show_error(self, primary_text,
+                   secondary_text=None, detailed_text=None):
         def onErrorBoxClosed():
             self.loop.quit()
 
-        self.qtiface.showError(text,
-            reply_handler=dummy_handle_reply,
-            error_handler=dummy_handle_error)
+        self.qtiface.showError(primary_text,
+                secondary_text, detailed_text,
+                reply_handler=dummy_handle_reply,
+                error_handler=dummy_handle_error)
         self.wait_on_signals(
             errorBoxClosed=onErrorBoxClosed)
 
+    def update_status(self, job):
+        if 'type' in job and job["type"] == "test":
+            self.qtiface.updateAutoTestStatus(job["status"], job["name"])
+
     def wait_on_signals(self, **signals):
-        for name, function in signals.iteritems():
+        for name, function in signals.items():
             self.bus.add_signal_receiver(function, name)
 
         self.loop.run()
         if self.direction == KeyboardInterrupt:
             raise KeyboardInterrupt
 
-        for name, function in signals.iteritems():
+        for name, function in signals.items():
             self.bus.remove_signal_receiver(function, name)
 
=== modified file 'checkbox_urwid/urwid_interface.py'
--- checkbox_urwid/urwid_interface.py	2012-02-23 11:56:50 +0000
+++ checkbox_urwid/urwid_interface.py	2012-06-23 00:59:17 +0000
@@ -27,7 +27,27 @@
                                      ALL_ANSWERS, ANSWER_TO_STATUS)
 
 
-class Dialog(object):
+# HACK to workaround bug in urwid.container, line 1273
+class ComparableString(str):
+
+    def __init__(self, string):
+        self.string = string
+
+    def __getattr__(self, name):
+        return getattr(self.string, name)
+
+    def __lt__(self, other):
+        if not isinstance(other, str):
+            return False
+        return self.string < other
+
+    def __gt__(self, other):
+        if not isinstance(other, str):
+            return False
+        return self.string > other
+
+
+class Dialog:
     """
     Basic dialog class that displays some text
     """
@@ -77,8 +97,10 @@
         if not body:
             text = urwid.Text(self.text)
             walker = urwid.SimpleListWalker([])
+            list_box = urwid.ListBox(walker)
+            list_box.pref_col = ComparableString(list_box.pref_col)
             body = urwid.Pile((('flow', text),
-                               ('weight', 1, urwid.ListBox(walker))))
+                               ('weight', 1, list_box)))
             self.walker = walker
 
         frame = urwid.AttrMap(urwid.Frame(body, header, footer), 'body')
@@ -290,9 +312,9 @@
         """
         Return the label of the selected radio button
         """
-        label = (radio_button.get_label()
+        label = next((radio_button.get_label()
                  for radio_button in self.radio_button_group
-                 if radio_button.get_state()).next()
+                 if radio_button.get_state()))
         return label
 
 
@@ -379,7 +401,7 @@
                                      widget.changed_cb, self.walker)
 
         if isinstance(data, dict):
-            items = sorted(data.iteritems(), key=itemgetter(0))
+            items = sorted(iter(data.items()), key=itemgetter(0))
             for children_name, children_data in items:
                 child_widget = self.create_tree(children_name, children_data, widget)
                 widget.append(child_widget)
@@ -392,7 +414,7 @@
         Set selected nodes by default recursively
         """
         if isinstance(default, dict):
-            for name, default_children in default.iteritems():
+            for name, default_children in default.items():
                 for widget in widgets:
                     if widget.name == name:
                         widget.state = True
@@ -408,7 +430,7 @@
 
         # Show tree
         self.option_widgets = []
-        items = sorted(self.options.iteritems(),
+        items = sorted(iter(self.options.items()),
                        key=itemgetter(0))
         for name, data in items:
             widget = self.create_tree(name, data)
@@ -498,10 +520,10 @@
         urwid.signals.connect_signal(widget, 'change',
                                      widget.changed_cb, self.walker)
 
-        items = sorted(data.iteritems(), key=itemgetter(0))
+        items = sorted(iter(data.items()), key=itemgetter(0))
         for child_name, child_data in items:
             is_suite = all(issubclass(type(value), dict)
-                           for value in child_data.itervalues())
+                           for value in child_data.values())
 
             if is_suite:
                 child_widget = self.create_tree(child_name,
@@ -533,7 +555,7 @@
         Dialog.show(self)
 
         # Show tree
-        items = sorted(self.results.iteritems(),
+        items = sorted(iter(self.results.items()),
                        key=itemgetter(0))
         for name, data in items:
             widget = self.create_tree(name, data)
@@ -899,7 +921,7 @@
         """
         Pulse progress bar
         """
-        start, end = self.progress_coordinates.next()
+        start, end = next(self.progress_coordinates)
         bar_data = [[0]]*start + [[1]]*(end-start) + [[0]]*(self.MAX_VALUE-end)
         self.progress_bar.set_data(bar_data, 1)
         self.loop.draw_screen()
@@ -955,7 +977,7 @@
         return dialog.response
 
 
-    def show_entry(self, text, value, previous=None, next=None):
+    def show_entry(self, text, value, label=None, previous=None, next=None):
         dialog = InputDialog(text).run()
         self.direction = dialog.direction
         return dialog.response
@@ -974,7 +996,7 @@
         return dialog.response
 
 
-    def show_tree(self, text, options={}, default={}):
+    def show_tree(self, text, options={}, default={}, deselect_warning=""):
         """
         Show some options in a tree hierarchy
         and let the user choose between them
@@ -1004,8 +1026,7 @@
             output = ''
 
         # Get options
-        options = list([self.ANSWER_TO_OPTION[a]
-                        for a in ALL_ANSWERS])
+        options = [self.ANSWER_TO_OPTION[a] for a in ALL_ANSWERS]
 
         # Get buttons
         buttons = []
@@ -1040,9 +1061,11 @@
         """
         return self.show_radio(text, options, default)
 
-
-    def show_error(self, text):
+    def show_error(self, primary_text,
+                   secondary_text=None, detailed_text=None):
         """
         Show an error message
         """
+        text = filter(None, [primary_text, secondary_text, detailed_text])
+        text = '\n'.join(text)
         return self.show_radio(text)
 
=== removed file 'data/audio/Ogg_Vorbis_Audio.oga'
 Binary files data/audio/Ogg_Vorbis_Audio.oga	2010-08-13 16:23:16 +0000 and data/audio/Ogg_Vorbis_Audio.oga	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/Derivatives_of_Ubuntu.doc'
 Binary files data/documents/Derivatives_of_Ubuntu.doc	2010-08-13 16:23:16 +0000 and data/documents/Derivatives_of_Ubuntu.doc	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/OpenOffice_Presentation_Test.odp'
 Binary files data/documents/OpenOffice_Presentation_Test.odp	2010-08-13 16:23:16 +0000 and data/documents/OpenOffice_Presentation_Test.odp	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/OpenOffice_Spreadsheet_Payment.ods'
 Binary files data/documents/OpenOffice_Spreadsheet_Payment.ods	2010-08-13 16:23:16 +0000 and data/documents/OpenOffice_Spreadsheet_Payment.ods	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/OpenOffice_Text_Test.odt'
 Binary files data/documents/OpenOffice_Text_Test.odt	2010-08-13 16:23:16 +0000 and data/documents/OpenOffice_Text_Test.odt	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/PDF_Test.pdf'
 Binary files data/documents/PDF_Test.pdf	2010-08-13 16:23:16 +0000 and data/documents/PDF_Test.pdf	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/documents/RTF_Russian.rtf'
--- data/documents/RTF_Russian.rtf	2010-08-13 16:23:16 +0000
+++ data/documents/RTF_Russian.rtf	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-{\rtf1\ansi\deff1\adeflang1025
-{\fonttbl{\f0\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f1\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f2\fnil\fprq2\fcharset0 HG Mincho Light J{\*\falt msmincho};}{\f3\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f4\fswiss\fprq2\fcharset0 Nimbus Sans L{\*\falt Arial};}{\f5\fnil\fprq0\fcharset2 StarSymbol{\*\falt Arial Unicode MS};}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red128\green128\blue128;}
-{\stylesheet{\s1\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057\snext1 Normal;}
-{\s2\sb240\sa120\keepn\rtlch\af1\afs28\lang255\ltrch\dbch\af2\langfe255\hich\f4\fs28\lang2057\loch\f4\fs28\lang2057\sbasedon1\snext3 Heading;}
-{\s3\sa120\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057\sbasedon1\snext3 Body Text;}
-{\s4\sa120\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057\sbasedon3\snext4 List;}
-{\s5\sb120\sa120\rtlch\af4\afs24\lang255\ai\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\i\loch\fs24\lang2057\i\sbasedon1\snext5 caption;}
-{\s6\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057\sbasedon1\snext6 Index;}
-{\s7\sb120\sa120\rtlch\af4\afs24\lang255\ai\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\i\loch\fs24\lang2057\i\sbasedon1\snext7 caption;}
-{\s8\sb240\sa120\keepn\rtlch\afs36\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs36\lang2057\b\loch\f1\fs36\lang2057\b\sbasedon2\snext3{\*\soutlvl1} heading 2;}
-{\s9\sb240\sa120\keepn\rtlch\afs28\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs28\lang2057\b\loch\f1\fs28\lang2057\b\sbasedon2\snext3{\*\soutlvl2} heading 3;}
-{\*\cs11\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 1;}
-{\*\cs12\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 2;}
-{\*\cs13\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 3;}
-{\*\cs14\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 4;}
-{\*\cs15\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 5;}
-{\*\cs16\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 6;}
-{\*\cs17\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 7;}
-{\*\cs18\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 8;}
-{\*\cs19\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 9;}
-{\*\cs20\cf0\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 RTF_Num 2 10;}
-{\*\cs21\rtlch\af4\afs24\lang255\ab\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\b\loch\fs24\lang2057\b Strong Emphasis;}
-{\*\cs22\cf2\ul\ulc0\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 Internet link;}
-{\*\cs23\rtlch\af5\afs18\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs18\lang2057\loch\f5\fs18\lang2057 Bullet Symbols;}
-{\*\cs24\cf2\ul\ulc0\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang2057\loch\f1\fs24\lang2057 Internet link;}
-}
-{\info{\creatim\yr2006\mo3\dy8\hr21\min21}{\revtim\yr1601\mo1\dy1\hr0\min0}{\printim\yr1601\mo1\dy1\hr0\min0}{\comment StarWriter}{\vern6800}}\deftab709
-{\*\pgdsctbl
-{\pgdsc0\pgdscuse195\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Standard;}}
-{\*\pgdscno0}\paperh16837\paperw11905\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
-\pard\plain \ltrpar\s8\sb240\sa120\keepn\ql\rtlch\afs36\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs36\lang2057\b\loch\f1\fs36\lang2057\b {\rtlch \ltrch\loch\f1\fs36\lang2057\i0\b {\*\bkmkstart head-3abc76a6b8f36bdd2210d781fb32b17aa137bd22}{\*\bkmkend head-3abc76a6b8f36bdd2210d781fb32b17aa137bd22}\u1054\'3f\u1073\'3f Ubuntu}
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 Ubuntu \u1101\'3f\u1090\'3f\u1086\'3f \u1076\'3f\u1080\'3f\u1089\'3f\u1090\'3f\u1088\'3f\u1080\'3f\u1073\'3f\u1091\'3f\u1090\'3f\u1080\'3f\u1074\'3f Linux \u1089\'3f\u1086\'3f\u1079\'3f\u1076\'3f\u1072\'3f\u1085\'3f\u1085\'3f\u1099\'3f\u1081\'3f \u1074\'3f \u1076\'3f\u1091\'3f\u1093\'3f\u1077\'3f Debian (\u1080\'3f \u1086\'3f\u1089\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1085\'3f\u1085\'3f\u1099\'3f\u1081\'3f \u1085\'3f\u1072\'3f \u1085\'3f\u1105\'3f\u1084\'3f), \u1082\'3f\u1086\'3f\u1090\'3f\u1086\'3f\u1088\'3f\u1099\'3f\u1081\'3f \u1080\'3f\u1084\'3f\u1077\'3f\u1077\'3f\u1090\'3f \u1095\'3f\u1105\'3f\u1090\'3f\u1082\'3f\u1080\'3f\u1081\'3f \u1075\'3f\u1088\'3f\u1072\'3f\u1092\'3f\u1080\'3f\u1082\'3f \u1088\'3f\u1077\'3f\u1083\'3f\u1080\'3f\u1079\'3f\u1086\'3f\u1074\'3f (\u1085\'3f\u1086\'3f\u1074\'3f\u1099\'3f\u1081\'3f \u1088\'3f\u1077\'3f\u1083\'3f\u1080\'3f\u1079\'3f \u1082\'3f\u1072\'3f\u1078\'3f\u1076\'3f\u1099\'3f\u1077\'3f \u1096\'3f\u1077\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1084\'3f\u1077\'3f\u1089\'3f\u1103\'3f\u1094\'3f\u1077\'3f\u1074\'3f) \u1080\'3f \u1086\'3f\u1088\'3f\u1080\'3f\u1077\'3f\u1085\'3f\u1090\'3f\u1080\'3f\u1088\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1085\'3f\u1085\'3f\u1099\'3f\u1081\'3f \u1085\'3f\u1072\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f\u1090\'3f\u1091\'3f \u1080\'3f\u1089\'3f\u1087\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1079\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1085\'3f\u1080\'3f\u1103\'3f \u1080\'3f \u1091\'3f\u1076\'3f\u1086\'3f\u1073\'3f\u1089\'3f\u1090\'3f\u1074\'3f\u1086\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1099\'3f (\u1074\'3f\u1089\'3f\u1105\'3f \u1076\'3f\u1086\'3f\u1083\'3f\u1078\'3f\u1085\'3f\u1086\'3f "\u1087\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1072\'3f\u1090\'3f\u1100\'3f" TM). \u1050\'3f\u1072\'3f\u1078\'3f\u1076\'3f\u1099\'3f\u1081\'3f \u1088\'3f\u1077\'3f\u1083\'3f\u1080\'3f\u1079\'3f
- Ubuntu \u1087\'3f\u1086\'3f\u1076\'3f\u1076\'3f\u1077\'3f\u1088\'3f\u1078\'3f\u1080\'3f\u1074\'3f\u1072\'3f\u1077\'3f\u1090\'3f\u1089\'3f\u1103\'3f \u1086\'3f\u1073\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1083\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1103\'3f\u1084\'3f\u1080\'3f \u1073\'3f\u1077\'3f\u1079\'3f\u1086\'3f\u1087\'3f\u1072\'3f\u1089\'3f\u1085\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1080\'3f (security updates) \u1074\'3f \u1090\'3f\u1077\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f 18 \u1084\'3f\u1077\'3f\u1089\'3f\u1103\'3f\u1094\'3f\u1077\'3f\u1074\'3f. Ubuntu \u1087\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1074\'3f\u1083\'3f\u1103\'3f\u1077\'3f\u1090\'3f\u1089\'3f\u1103\'3f \u1089\'3f \u1089\'3f\u1072\'3f\u1084\'3f\u1086\'3f\u1081\'3f \u1089\'3f\u1074\'3f\u1077\'3f\u1078\'3f\u1077\'3f\u1081\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1089\'3f\u1080\'3f\u1077\'3f\u1081\'3f Gnome \u1080\'3f \u1089\'3f \u1090\'3f\u1072\'3f\u1082\'3f\u1086\'3f\u1081\'3f \u1087\'3f\u1086\'3f\u1076\'3f\u1073\'3f\u1086\'3f\u1088\'3f\u1082\'3f\u1086\'3f\u1081\'3f \u1089\'3f\u1077\'3f\u1088\'3f\u1074\'3f\u1077\'3f\u1088\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1080\'3f \u1076\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1090\'3f\u1086\'3f\u1087\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1075\'3f\u1088\'3f\u1072\'3f\u1084\'3f\u1084\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1086\'3f\u1073\'3f\u1077\'3f\u1089\'3f\u1087\'3f\u1077\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1103\'3f \u1082\'3f\u1086\'3f\u1090\'3f\u1086\'3f\u1088\'3f\u1072\'3f\u1103\'3f \u1087\'3f\u1086\'3f\u1079\'3f\u1074\'3f\u1086\'3f\u1083\'3f\u1103\'3f\u1077\'3f\u1090\'3f \u1089\'3f\u1086\'3f\u1079\'3f\u1076\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1091\'3f\u1076\'3f\u1086\'3f\u1073\'3f\u1085\'3f\u1086\'3f\u1077\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1095\'3f\u1077\'3f\u1077\'3f \u1086\'3f\u1082\'3f\u1088\'3f\u1091\'3f\u1078\'3f
-\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f c \u1087\'3f\u1086\'3f\u1084\'3f\u1086\'3f\u1097\'3f\u1100\'3f\u1102\'3f \u1074\'3f\u1089\'3f\u1077\'3f\u1075\'3f\u1086\'3f \u1083\'3f\u1080\'3f\u1096\'3f\u1100\'3f \u1086\'3f\u1076\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1086\'3f\u1095\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f CD. }
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 \u1063\'3f\u1090\'3f\u1086\'3f \u1078\'3f\u1077\'3f \u1076\'3f\u1077\'3f\u1083\'3f\u1072\'3f\u1077\'3f\u1090\'3f Ubuntu \u1086\'3f\u1089\'3f\u1086\'3f\u1073\'3f\u1099\'3f\u1084\'3f? \u1055\'3f\u1086\'3f\u1095\'3f\u1077\'3f\u1084\'3f\u1091\'3f \u1083\'3f\u1102\'3f\u1076\'3f\u1080\'3f \u1074\'3f\u1099\'3f\u1073\'3f\u1080\'3f\u1088\'3f\u1072\'3f\u1102\'3f\u1090\'3f Ubuntu \u1074\'3f \u1082\'3f\u1072\'3f\u1095\'3f\u1077\'3f\u1089\'3f\u1090\'3f\u1074\'3f\u1077\'3f \u1083\'3f\u1102\'3f\u1073\'3f\u1080\'3f\u1084\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1076\'3f\u1080\'3f\u1089\'3f\u1090\'3f\u1088\'3f\u1080\'3f\u1073\'3f\u1091\'3f\u1090\'3f\u1080\'3f\u1074\'3f\u1072\'3f \u1076\'3f\u1083\'3f\u1103\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1099\'3f \u1080\'3f \u1088\'3f\u1072\'3f\u1079\'3f\u1074\'3f\u1083\'3f\u1077\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f? }
-\par \pard\plain \ltrpar\s9\sb240\sa120\keepn\ql\rtlch\afs28\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs28\lang2057\b\loch\f1\fs28\lang2057\b {\rtlch \ltrch\loch\f1\fs28\lang2057\i0\b \u1056\'3f\u1077\'3f\u1075\'3f\u1091\'3f\u1083\'3f\u1103\'3f\u1088\'3f\u1085\'3f\u1099\'3f\u1077\'3f \u1080\'3f \u1087\'3f\u1088\'3f\u1077\'3f\u1076\'3f\u1089\'3f\u1082\'3f\u1072\'3f\u1079\'3f\u1091\'3f\u1077\'3f\u1084\'3f\u1099\'3f\u1077\'3f \u1088\'3f\u1077\'3f\u1083\'3f\u1080\'3f\u1079\'3f\u1099\'3f}
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 \u1050\'3f\u1086\'3f\u1084\'3f\u1072\'3f\u1085\'3f\u1076\'3f\u1072\'3f \u1088\'3f\u1072\'3f\u1079\'3f\u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1095\'3f\u1080\'3f\u1082\'3f\u1086\'3f\u1074\'3f Ubuntu \u1074\'3f\u1099\'3f\u1087\'3f\u1091\'3f\u1089\'3f\u1082\'3f\u1072\'3f\u1077\'3f\u1090\'3f \u1085\'3f\u1086\'3f\u1074\'3f\u1091\'3f\u1102\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1089\'3f\u1080\'3f\u1102\'3f Ubuntu \u1082\'3f\u1072\'3f\u1078\'3f\u1076\'3f\u1099\'3f\u1077\'3f \u1096\'3f\u1077\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1084\'3f\u1077\'3f\u1089\'3f\u1103\'3f\u1094\'3f\u1077\'3f\u1074\'3f. \u1054\'3f\u1085\'3f\u1072\'3f \u1089\'3f\u1086\'3f\u1076\'3f\u1077\'3f\u1088\'3f\u1078\'3f\u1080\'3f\u1090\'3f \u1087\'3f\u1086\'3f\u1089\'3f\u1083\'3f\u1077\'3f\u1076\'3f\u1085\'3f\u1102\'3f\u1102\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1089\'3f\u1080\'3f\u1102\'3f \u1103\'3f\u1076\'3f\u1088\'3f\u1072\'3f, X, Gnome \u1080\'3f \u1076\'3f\u1088\'3f\u1091\'3f\u1075\'3f\u1080\'3f\u1093\'3f \u1086\'3f\u1089\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1085\'3f\u1099\'3f\u1093\'3f \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f \u1080\'3f \u1087\'3f\u1086\'3f\u1076\'3f\u1076\'3f\u1077\'3f\u1088\'3f\u1078\'3f\u1080\'3f\u1074\'3f\u1072\'3f\u1077\'3f\u1090\'3f\u1089\'3f\u1103\'3f \u1086\'3f\u1073\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1083\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1103\'3f\u1084\'3f\u1080\'3f \u1073\'3f\u1077\'3f\u1079\'3f\u1086\'3f\u1087\'3f\u1072\'3f\u1089\'3f\u1085\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1080\'3f \u1074\'3f \u1090\'3f\u1077\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f 18 \u1084\'3f\u1077\'3f\u1089\'3f\u1103\'3f\u1094\'3f\u1077\'3f\u1074\'3f. \u1055\'3f\u1077\'3f\u1088\'3f\u1074\'3f\u1099\'3f\u1084\'3f \u1087\'3f\u1091\'3f\u1073\'3f\u1083\'3f\u1080\'3f\u1095\'3f\u1085\'3f\u1099\'3f\u1084\'3f \u1088\'3f\u1077\'3f\u1083\'3f\u1080\'3f\u1079\'3f\u1086\'3f\u1084\'3f Ubuntu \u1073\'3f\u1099\'3f\u1083\'3f 
-**Ubuntu 4.10 Preview** (\u1082\'3f\u1086\'3f\u1076\'3f\u1086\'3f\u1074\'3f\u1086\'3f\u1077\'3f \u1085\'3f\u1072\'3f\u1079\'3f\u1074\'3f\u1072\'3f\u1085\'3f\u1080\'3f\u1077\'3f "the {\*\cs21\rtlch\ltrch\dbch\hich\fs24\lang2057\b\loch\fs24\lang2057\b Warty Warthog}" \u1080\'3f\u1083\'3f\u1080\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f "{\*\cs21\rtlch\ltrch\dbch\hich\fs24\lang2057\b\loch\fs24\lang2057\b Warty}"). \u1042\'3f\u1099\'3f \u1084\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1090\'3f\u1077\'3f \u1079\'3f\u1072\'3f\u1075\'3f\u1088\'3f\u1091\'3f\u1079\'3f\u1080\'3f\u1090\'3f\u1100\'3f \u1086\'3f\u1073\'3f\u1088\'3f\u1072\'3f\u1079\'3f CD \u1080\'3f \u1079\'3f\u1072\'3f\u1087\'3f\u1080\'3f\u1089\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1077\'3f\u1075\'3f\u1086\'3f \u1089\'3f\u1072\'3f\u1084\'3f\u1080\'3f \u1080\'3f\u1083\'3f\u1080\'3f \u1079\'3f\u1072\'3f\u1082\'3f\u1072\'3f\u1079\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1077\'3f\u1075\'3f\u1086\'3f \u1091\'3f \u1085\'3f\u1072\'3f\u1089\'3f. }
-\par \pard\plain \ltrpar\s9\sb240\sa120\keepn\ql\rtlch\afs28\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs28\lang2057\b\loch\f1\fs28\lang2057\b {\rtlch \ltrch\loch\f1\fs28\lang2057\i0\b \u1041\'3f\u1077\'3f\u1089\'3f\u1087\'3f\u1083\'3f\u1072\'3f\u1090\'3f\u1085\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1100\'3f}
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 Ubuntu \u1103\'3f\u1074\'3f\u1083\'3f\u1103\'3f\u1077\'3f\u1090\'3f\u1089\'3f\u1103\'3f \u1089\'3f\u1074\'3f\u1086\'3f\u1073\'3f\u1086\'3f\u1076\'3f\u1085\'3f\u1099\'3f\u1084\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1075\'3f\u1088\'3f\u1072\'3f\u1084\'3f\u1084\'3f\u1085\'3f\u1099\'3f\u1084\'3f \u1086\'3f\u1073\'3f\u1077\'3f\u1089\'3f\u1087\'3f\u1077\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f\u1084\'3f \u1080\'3f \u1076\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1091\'3f\u1087\'3f\u1077\'3f\u1085\'3f \u1073\'3f\u1077\'3f\u1089\'3f\u1087\'3f\u1083\'3f\u1072\'3f\u1090\'3f\u1085\'3f\u1086\'3f. \u1042\'3f \u1086\'3f\u1090\'3f\u1083\'3f\u1080\'3f\u1095\'3f\u1080\'3f\u1077\'3f \u1086\'3f\u1090\'3f \u1084\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1080\'3f\u1093\'3f \u1076\'3f\u1088\'3f\u1091\'3f\u1075\'3f\u1080\'3f\u1093\'3f \u1082\'3f\u1086\'3f\u1084\'3f\u1084\'3f\u1077\'3f\u1088\'3f\u1095\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1080\'3f\u1093\'3f \u1076\'3f\u1080\'3f\u1089\'3f\u1090\'3f\u1088\'3f\u1080\'3f\u1073\'3f\u1091\'3f\u1090\'3f\u1080\'3f\u1074\'3f\u1086\'3f\u1074\'3f \u1080\'3f\u1079\'3f \u1084\'3f\u1080\'3f\u1088\'3f\u1072\'3f Linux (Libranet, Lindows, Xandros, Red Hat) \u1082\'3f\u1086\'3f\u1084\'3f\u1072\'3f\u1085\'3f\u1076\'3f\u1072\'3f \u1088\'3f\u1072\'3f\u1079\'3f\u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1095\'3f\u1080\'3f\u1082\'3f\u1086\'3f\u1074\'3f Ubuntu \u1076\'3f\u1077\'3f\u1081\'3f\u1089\'3f\u1090\'3f\u1074\'3f\u1080\'3f\u1090\'3f\u1077\'3f\u1083\'3f\u1100\'3f\u1085\'3f\u1086\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1080\'3f\u1090\'3f \u1074\'3f \u1090\'3f\u1086\'3f \u1095\'3f\u1090\'3f\u1086\'3f \u1057\'3f\u1074\'3f\u1086\'3f\u1073\'3f\u1086\'3f\u1076\'3f\u1085\'3f\u1086\'3f\u1077\'3f \u1055\'3f\u1054\'3f \u1076\'3f\u1086\'3f\u1083\'3f\u1078\'3f\u1085\'3f\u1086\'3f
- \u1073\'3f\u1099\'3f\u1090\'3f\u1100\'3f \u1089\'3f\u1074\'3f\u1086\'3f\u1073\'3f\u1086\'3f\u1076\'3f\u1085\'3f\u1086\'3f \u1086\'3f\u1090\'3f \u1079\'3f\u1072\'3f\u1090\'3f\u1088\'3f\u1072\'3f\u1090\'3f \u1085\'3f\u1072\'3f \u1083\'3f\u1080\'3f\u1094\'3f\u1077\'3f\u1085\'3f\u1079\'3f\u1080\'3f\u1088\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1085\'3f\u1080\'3f\u1077\'3f. }
-\par \pard\plain \ltrpar\s9\sb240\sa120\keepn\ql\rtlch\afs28\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs28\lang2057\b\loch\f1\fs28\lang2057\b {\rtlch \ltrch\loch\f1\fs28\lang2057\i0\b \u1055\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1103\'3f \u1080\'3f \u1073\'3f\u1099\'3f\u1089\'3f\u1090\'3f\u1088\'3f\u1072\'3f\u1103\'3f \u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1082\'3f\u1072\'3f}
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 \u1042\'3f Ubuntu \u1085\'3f\u1077\'3f\u1090\'3f \u1082\'3f\u1088\'3f\u1072\'3f\u1089\'3f\u1080\'3f\u1074\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1075\'3f\u1088\'3f\u1072\'3f\u1092\'3f\u1080\'3f\u1095\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1086\'3f\u1075\'3f\u1086\'3f \u1080\'3f\u1085\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1083\'3f\u1103\'3f\u1090\'3f\u1086\'3f\u1088\'3f\u1072\'3f, \u1074\'3f \u1085\'3f\u1105\'3f\u1084\'3f \u1077\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1055\'3f\u1056\'3f\u1054\'3f\u1057\'3f\u1058\'3f\u1054\'3f\u1049\'3f \u1080\'3f \u1041\'3f\u1067\'3f\u1057\'3f\u1058\'3f\u1056\'3f\u1067\'3f\u1049\'3f \u1080\'3f\u1085\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1083\'3f\u1103\'3f\u1090\'3f\u1086\'3f\u1088\'3f. \u1051\'3f\u1072\'3f\u1076\'3f\u1085\'3f\u1086\'3f, \u1074\'3f \u1085\'3f\u1105\'3f\u1084\'3f \u1076\'3f\u1086\'3f \u1089\'3f\u1080\'3f\u1093\'3f \u1087\'3f\u1086\'3f\u1088\'3f \u1077\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1085\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1082\'3f\u1086\'3f \u1084\'3f\u1077\'3f\u1089\'3f\u1090\'3f \u1075\'3f\u1076\'3f\u1077\'3f \u1074\'3f\u1099\'3f \u1076\'3f\u1086\'3f\u1083\'3f\u1078\'3f\u1085\'3f\u1099\'3f \u1079\'3f\u1085\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1095\'3f\u1090\'3f\u1086\'3f \u1074\'3f\u1099\'3f \u1076\'3f\u1077\'3f\u1083\'3f\u1072\'3f\u1077\'3f\u1090\'3f\u1077\'3f, \u1085\'3f\u1086\'3f \u1079\'3f\u1085\'3f\u1072\'3f\u1095\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1103\'3f \u1087\'3f\u1086\'3f \u1091\'3f\u1084\'3f\u1086\'3f\u1083\'3f\u1095\'3f\u1072\'3f\u1085\'3f\u1080\'3f\u1102\'3f \u1087\'3f\u1086\'3f\u1076\'3f\u1086\'3f\u1081\'3f\u1076\'3f\u1091\'3f\u1090\'3f \u1076\'3f\u1083\'3f\u1103\'3f \u1073\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1096\'3f\u1080\'3f\u1085\'3f\u1089\'3f\u1090\'3f\u1074\'3f\u1072\'3f \u1087\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1079\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1090\'3f\u1077\'3f\u1083\'3f\u1077\'3f\u1081\'3f. \u1052\'3f\u1099\'3f \u1089\'3f\u1076\'3f\u1077\'3f\u1083\'3f\u1072\'3f\u1083\'3f\u1080\'3f \u1082\'3f\u1086\'3f\u1084\'3f\u1087\'3f\u1083\'3f\u1077\'3f\u1082\'3f\u1090\'3f \u1091\'3f
-\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1086\'3f\u1095\'3f\u1085\'3f\u1099\'3f\u1093\'3f \u1076\'3f\u1080\'3f\u1089\'3f\u1082\'3f\u1086\'3f\u1074\'3f \u1089\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f\u1103\'3f\u1097\'3f\u1080\'3f\u1081\'3f \u1074\'3f\u1089\'3f\u1077\'3f\u1075\'3f\u1086\'3f \u1083\'3f\u1080\'3f\u1096\'3f\u1100\'3f \u1080\'3f\u1079\'3f \u1086\'3f\u1076\'3f\u1085\'3f\u1086\'3f\u1075\'3f\u1086\'3f CD, \u1074\'3f\u1089\'3f\u1105\'3f \u1086\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1083\'3f\u1100\'3f\u1085\'3f\u1086\'3f\u1077\'3f \u1076\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1091\'3f\u1087\'3f\u1085\'3f\u1086\'3f \u1087\'3f\u1086\'3f \u1089\'3f\u1077\'3f\u1090\'3f\u1080\'3f \u1074\'3f \u1089\'3f\u1083\'3f\u1091\'3f\u1095\'3f\u1072\'3f\u1077\'3f \u1085\'3f\u1077\'3f\u1086\'3f\u1073\'3f\u1093\'3f\u1086\'3f\u1076\'3f\u1080\'3f\u1084\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1080\'3f. \u1053\'3f\u1072\'3f \u1082\'3f\u1086\'3f\u1084\'3f\u1087\'3f\u1100\'3f\u1102\'3f\u1090\'3f\u1077\'3f\u1088\'3f\u1077\'3f \u1089\'3f\u1088\'3f\u1077\'3f\u1076\'3f\u1085\'3f\u1077\'3f\u1081\'3f \u1082\'3f\u1086\'3f\u1085\'3f\u1092\'3f\u1080\'3f\u1075\'3f\u1091\'3f\u1088\'3f\u1072\'3f\u1094\'3f\u1080\'3f\u1080\'3f \u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1082\'3f\u1072\'3f Ubuntu \u1087\'3f\u1088\'3f\u1086\'3f\u1080\'3f\u1079\'3f\u1074\'3f\u1086\'3f\u1076\'3f\u1080\'3f\u1090\'3f\u1089\'3f\u1103\'3f \u1084\'3f\u1077\'3f\u1085\'3f\u1077\'3f\u1077\'3f \u1095\'3f\u1077\'3f\u1084\'3f \u1079\'3f\u1072\'3f 25 \u1084\'3f\u1080\'3f\u1085\'3f\u1091\'3f\u1090\'3f. }
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 \u1048\'3f\u1085\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1083\'3f\u1103\'3f\u1090\'3f\u1086\'3f\u1088\'3f \u1085\'3f\u1077\'3f \u1075\'3f\u1088\'3f\u1072\'3f\u1092\'3f\u1080\'3f\u1095\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1080\'3f\u1081\'3f, \u1085\'3f\u1086\'3f \u1074\'3f\u1072\'3f\u1084\'3f \u1085\'3f\u1091\'3f\u1078\'3f\u1085\'3f\u1086\'3f \u1073\'3f\u1091\'3f\u1076\'3f\u1077\'3f\u1090\'3f \u1080\'3f\u1089\'3f\u1087\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1079\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1077\'3f\u1075\'3f\u1086\'3f \u1074\'3f\u1089\'3f\u1077\'3f\u1075\'3f\u1086\'3f \u1083\'3f\u1080\'3f\u1096\'3f\u1100\'3f \u1086\'3f\u1076\'3f\u1080\'3f\u1085\'3f \u1088\'3f\u1072\'3f\u1079\'3f \u1087\'3f\u1086\'3f\u1090\'3f\u1086\'3f\u1084\'3f\u1091\'3f \u1095\'3f\u1090\'3f\u1086\'3f \u1084\'3f\u1099\'3f \u1087\'3f\u1086\'3f\u1076\'3f\u1076\'3f\u1077\'3f\u1088\'3f\u1078\'3f\u1080\'3f\u1074\'3f\u1072\'3f\u1077\'3f\u1084\'3f \u1086\'3f\u1073\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1083\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f \u1089\'3f \u1086\'3f\u1076\'3f\u1085\'3f\u1086\'3f\u1081\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1089\'3f\u1080\'3f\u1080\'3f \u1085\'3f\u1072\'3f \u1076\'3f\u1088\'3f\u1091\'3f\u1075\'3f\u1091\'3f\u1102\'3f \u1087\'3f\u1086\'3f \u1089\'3f\u1077\'3f\u1090\'3f\u1080\'3f. \u1059\'3f \u1074\'3f\u1072\'3f\u1089\'3f \u1085\'3f\u1077\'3f\u1090\'3f \u1085\'3f\u1077\'3f\u1086\'3f\u1073\'3f\u1093\'3f\u1086\'3f\u1076\'3f\u1080\'3f\u1084\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1080\'3f \u1087\'3f\u1077\'3f\u1088\'3f\u1077\'3f\u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1072\'3f\u1074\'3f\u1083\'3f\u1080\'3f\u1074\'3f\u1072\'3f\u1090\'3f\u1100\'3f \u1086\'3f\u1087\'3f\u1077\'3f\u1088\'3f\u1072\'3f\u1094\'3f\u1080\'3f\u1086\'3f\u1085\'3f\u1085\'3f\u1091\'3f\u1102\'3f \u1089\'3f\u1080\'3f\u1089\'3f\u1090\'3f\u1077\'3f\u1084\'3f\u1091\'3f, \u1087\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f \u1086\'3f\u1073\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1080\'3f\u1090\'3f\u1077\'3f\u1089\'3f\u1100\'3f \u1089\'3f \u1090\'3f\u1077\'3f\u1082\'3f\u1091\'3f\u1097\'3f\u1077\'3f\u1081\'3f \u1074\'3f\u1077\'3f\u1088\'3f\u1089\'3f\u1080\'3f\u1080\'3f \u1085\'3f\u1072\'3f
- \u1089\'3f\u1083\'3f\u1077\'3f\u1076\'3f\u1091\'3f\u1102\'3f\u1097\'3f\u1091\'3f\u1102\'3f \u1082\'3f\u1086\'3f\u1075\'3f\u1076\'3f\u1072\'3f \u1079\'3f\u1072\'3f\u1093\'3f\u1086\'3f\u1090\'3f\u1080\'3f\u1090\'3f\u1077\'3f. }
-\par \pard\plain \ltrpar\s9\sb240\sa120\keepn\ql\rtlch\afs28\lang255\ab\ltrch\dbch\af4\langfe255\hich\f1\fs28\lang2057\b\loch\f1\fs28\lang2057\b {\rtlch \ltrch\loch\f1\fs28\lang2057\i0\b \u1043\'3f\u1086\'3f\u1090\'3f\u1086\'3f\u1074\'3f\u1085\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1082\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1077\'3f}
-\par \pard\plain \ltrpar\s3\sa120\ql\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\fs24\lang2057\loch\fs24\lang2057 {\rtlch \ltrch\loch\f1\fs24\lang2057\i0\b0 \u1050\'3f\u1072\'3f\u1082\'3f \u1090\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1082\'3f\u1086\'3f \u1074\'3f\u1099\'3f \u1079\'3f\u1072\'3f\u1074\'3f\u1077\'3f\u1088\'3f\u1096\'3f\u1080\'3f\u1090\'3f\u1077\'3f \u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1082\'3f\u1091\'3f \u1074\'3f\u1072\'3f\u1096\'3f\u1072\'3f \u1089\'3f\u1080\'3f\u1089\'3f\u1090\'3f\u1077\'3f\u1084\'3f\u1072\'3f \u1089\'3f\u1088\'3f\u1072\'3f\u1079\'3f\u1091\'3f \u1078\'3f\u1077\'3f \u1075\'3f\u1086\'3f\u1090\'3f\u1086\'3f\u1074\'3f\u1072\'3f \u1082\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1077\'3f. \u1042\'3f\u1099\'3f \u1080\'3f\u1084\'3f\u1077\'3f\u1077\'3f\u1090\'3f\u1077\'3f \u1087\'3f\u1086\'3f\u1083\'3f\u1085\'3f\u1099\'3f\u1081\'3f \u1082\'3f\u1086\'3f\u1084\'3f\u1087\'3f\u1083\'3f\u1077\'3f\u1082\'3f\u1090\'3f \u1073\'3f\u1080\'3f\u1079\'3f\u1085\'3f\u1077\'3f\u1089\'3f \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f, \u1080\'3f\u1085\'3f\u1090\'3f\u1077\'3f\u1088\'3f\u1085\'3f\u1077\'3f\u1090\'3f \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f, \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f \u1076\'3f\u1083\'3f\u1103\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1099\'3f \u1089\'3f \u1075\'3f\u1088\'3f\u1072\'3f\u1092\'3f\u1080\'3f\u1082\'3f\u1086\'3f\u1081\'3f \u1080\'3f \u1080\'3f\u1075\'3f\u1088\'3f\u1099\'3f. \u1054\'3f\u1076\'3f\u1080\'3f\u1085\'3f \u1076\'3f\u1080\'3f\u1089\'3f\u1082\'3f \u1087\'3f\u1088\'3f\u1077\'3f\u1076\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1074\'3f\u1080\'3f\u1090\'3f \u1074\'3f\u1072\'3f\u1084\'3f \u1093\'3f\u1086\'3f\u1088\'3f\u1086\'3f\u1096\'3f\u1077\'3f\u1077\'3f \u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1095\'3f\u1077\'3f\u1077\'3f \u1086\'3f\u1082\'3f\u1088\'3f\u1091\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1077\'3f "\u1080\'3f\u1079\'3f \u1082\'3f\u1086\'3f\u1088\'3f\u1086\'3f\u1073\'3f\u1082\'3f\u1080\'3f" \u1089\'3f\u1086\'3f  \u1084\'3f\u1085\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1089\'3f\u1090\'3f
-\u1074\'3f\u1086\'3f\u1084\'3f \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1081\'3f \u1076\'3f\u1083\'3f\u1103\'3f \u1076\'3f\u1086\'3f\u1084\'3f\u1072\'3f\u1096\'3f\u1085\'3f\u1080\'3f\u1093\'3f \u1080\'3f \u1073\'3f\u1080\'3f\u1079\'3f\u1085\'3f\u1077\'3f\u1089\'3f \u1087\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1079\'3f\u1086\'3f\u1074\'3f\u1072\'3f\u1090\'3f\u1077\'3f\u1083\'3f\u1077\'3f\u1081\'3f \u1091\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1083\'3f\u1077\'3f\u1085\'3f\u1099\'3f\u1093\'3f \u1087\'3f\u1086\'3f \u1091\'3f\u1084\'3f\u1086\'3f\u1083\'3f\u1095\'3f\u1072\'3f\u1085\'3f\u1080\'3f\u1102\'3f. \u1045\'3f\u1089\'3f\u1090\'3f\u1100\'3f \u1090\'3f\u1099\'3f\u1089\'3f\u1103\'3f\u1095\'3f\u1080\'3f \u1076\'3f\u1088\'3f\u1091\'3f\u1075\'3f\u1080\'3f\u1093\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1075\'3f\u1088\'3f\u1072\'3f\u1084\'3f\u1084\'3f \u1076\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1091\'3f\u1087\'3f\u1085\'3f\u1099\'3f\u1093\'3f \u1074\'3f\u1089\'3f\u1077\'3f\u1075\'3f\u1086\'3f \u1089\'3f \u1087\'3f\u1086\'3f\u1084\'3f\u1086\'3f\u1097\'3f\u1100\'3f\u1102\'3f \u1085\'3f\u1077\'3f\u1089\'3f\u1082\'3f\u1086\'3f\u1083\'3f\u1100\'3f\u1082\'3f\u1080\'3f\u1093\'3f \u1082\'3f\u1083\'3f\u1080\'3f\u1082\'3f\u1086\'3f\u1074\'3f \u1086\'3f\u1076\'3f\u1085\'3f\u1072\'3f\u1082\'3f\u1086\'3f \u1084\'3f\u1099\'3f \u1090\'3f\u1103\'3f\u1078\'3f\u1077\'3f\u1083\'3f\u1086\'3f \u1087\'3f\u1086\'3f\u1088\'3f\u1072\'3f\u1073\'3f\u1086\'3f\u1090\'3f\u1072\'3f\u1083\'3f\u1080\'3f \u1095\'3f\u1090\'3f\u1086\'3f\u1073\'3f\u1099\'3f \u1087\'3f\u1088\'3f\u1077\'3f\u1076\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1072\'3f\u1074\'3f\u1080\'3f\u1090\'3f\u1100\'3f \u1086\'3f\u1089\'3f\u1085\'3f\u1086\'3f\u1074\'3f\u1085\'3f\u1099\'3f\u1077\'3f \u1087\'3f\u1088\'3f\u1080\'3f\u1083\'3f\u1086\'3f\u1078\'3f\u1077\'3f\u1085\'3f\u1080\'3f\u1103\'3f \u1087\'3f\u1088\'3f\u1086\'3f\u1089\'3f\u1090\'3f\u1086\'3f \u1080\'3f \u1101\'3f\u1092\'3f\u1092\'3f\u1077\'3f\u1082\'3f\u1090\'3f\u1080\'3f\u1074\'3f\u1085\'3f\u1086\'3f. }
-\par }
 \ No newline at end of file
 
=== removed file 'data/documents/Trigonometric_functions.xls'
 Binary files data/documents/Trigonometric_functions.xls	2010-08-13 16:23:16 +0000 and data/documents/Trigonometric_functions.xls	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/SVG_Color_Image_Xubuntu.svg'
--- data/images/SVG_Color_Image_Xubuntu.svg	2010-08-13 16:23:16 +0000
+++ data/images/SVG_Color_Image_Xubuntu.svg	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="350.09"
-   height="112.48"
-   id="svg2381">
-  <defs
-     id="defs2383" />
-  <g
-     transform="translate(12.587294,0.2745725)"
-     id="layer1">
-    <g
-       transform="translate(-4,0)"
-       id="g3608"
-       style="fill:#033c71;fill-opacity:1">
-      <path
-         d="M 132.72462,38.685525 C 133.7806,38.68556 134.7406,39.069557 135.6046,39.837519 C 136.37259,40.605547 136.75659,41.565541 136.7566,42.717503 L 136.7566,59.133413 C 136.75659,60.477418 136.99658,61.58141 137.47659,62.445394 C 138.14858,63.693397 138.96457,64.509391 139.92458,64.893381 C 140.78856,65.181387 141.74855,65.325386 142.80456,65.325378 C 145.20453,65.325386 146.83652,64.605391 147.70054,63.16539 L 148.13253,62.445394 C 148.61251,61.389412 148.85251,60.285419 148.85253,59.133413 L 148.85253,42.717503 C 148.85251,41.181543 149.5245,40.029551 150.86852,39.261522 C 152.21248,38.493561 153.46048,38.493561 154.6125,39.261522 C 155.95646,40.029551 156.62846,41.181543 156.62849,42.717503 L 156.62849,59.133413 C 156.05246,65.757383 153.07648,70.077355 147.70054,72.093341 C 146.16452,72.669338 144.53253,72.957336 142.80456,72.957336 C 138.19658,72.957336 134.5966,71.229348 132.00462,67.773365 C 131.52462,67.197374 131.09262,66.573378 130.70863,65.901375 C 129.55663,63.693397 128.98064,61.437411 128.98064,59.133413 L 128.98064,42.717503 C 128.98064,40.989545 129.70063,39.789552 131.14063,39.117523 C 131.62062,38.829559 132.14862,38.68556 132.72462,38.685525 M 177.11687,72.957336 L 177.69287,72.957336 L 177.69287,72.957336 C 179.99684,72.861337 182.20482,72.093342 184.31683,70.653349 C 187.77279,68.349366 189.88477,64.557391 190.6528,59.277412 C 190.84477,58.221432 190.94076,57.06944 190.9408,55.821431 C 190.94076,49.773487 189.11678,45.213517 185.46883,42.141506 C 182.97282,39.933551 180.18883,38.829559 177.11687,38.829524 C 174.81287,39.117557 172.79688,39.597554 171.06891,40.269517 L 171.06891,29.469576 C 171.06889,28.317627 170.6849,27.405633 169.91691,26.733591 C 169.14891,25.869643 168.23691,25.437646 167.18093,25.437598 C 165.54893,25.437646 164.44494,26.205641 163.86895,27.741586 C 163.58094,28.221628 163.43694,28.797624 163.43695,29.469576 L 163.43695,57.261423 C 163.43694,64.077394 165.78893,68.829363 170.49291,71.517344 C 172.70088,72.669338 174.90887,73.149335 177.11687,72.957336 M 171.06891,57.261423 L 171.06891,52.509449 C 171.06889,50.205485 171.74089,48.621495 173.08489,47.757475 C 173.27688,47.661501 173.56488,47.517502 173.94889,47.325478 C 175.00487,46.749507 176.06086,46.461509 177.11687,46.461482 C 178.26885,46.653508 179.22884,46.989505 179.99686,47.469477 C 182.20482,48.909493 183.30881,51.693475 183.30884,55.821431 C 183.30881,59.949421 182.20482,62.781403 179.99686,64.317384 C 179.03684,64.989388 178.07685,65.373386 177.11687,65.469378 L 176.68487,65.469378 C 173.51688,65.469385 171.69289,63.645397 171.2129,59.997408 C 171.11689,59.133426 171.06889,58.221432 171.06891,57.261423 M 201.06799,38.685525 C 202.12397,38.68556 203.08397,39.069557 203.94797,39.837519 C 204.71596,40.605547 205.09995,41.565541 205.09996,42.717503 L 205.09996,59.133413 C 205.09995,60.477418 205.33995,61.58141 205.81996,62.445394 C 206.49194,63.693397 207.30794,64.509391 208.26795,64.893381 C 209.13193,65.181387 210.09192,65.325386 211.14793,65.325378 C 213.5479,65.325386 215.17989,64.605391 216.0439,63.16539 L 216.4759,62.445394 C 216.95588,61.389412 217.19587,60.285419 217.1959,59.133413 L 217.1959,42.717503 C 217.19587,41.181543 217.86787,40.029551 219.21189,39.261522 C 220.55585,38.493561 221.80384,38.493561 222.95587,39.261522 C 224.29983,40.029551 224.97182,41.181543 224.97186,42.717503 L 224.97186,59.133413 C 224.39583,65.757383 221.41985,70.077355 216.0439,72.093341 C 214.50789,72.669338 212.8759,72.957336 211.14793,72.957336 C 206.53994,72.957336 202.93997,71.229348 200.34799,67.773365 C 199.86799,67.197374 199.43599,66.573378 199.052,65.901375 C 197.9,63.693397 197.324,61.437411 197.32401,59.133413 L 197.32401,42.717503 C 197.324,40.989545 198.044,39.789552 199.484,39.117523 C 199.96399,38.829559 200.49198,38.68556 201.06799,38.685525 M 231.63632,52.797448 C 231.63632,49.43749 232.64431,46.509509 234.66031,44.013496 C 237.06029,40.941545 240.56426,39.405555 245.17225,39.405521 C 252.08419,40.07755 256.35616,43.19753 257.98818,48.76547 C 258.27615,50.013486 258.46815,51.357477 258.56418,52.797448 L 258.56418,69.213357 C 258.56415,70.749351 257.84415,71.853344 256.40419,72.525339 C 255.82816,72.813337 255.30017,72.957336 254.8202,72.957336 C 253.18818,72.957336 252.08419,72.189341 251.50822,70.653349 C 251.31619,70.173355 251.22019,69.693358 251.22022,69.213357 L 251.22022,52.797448 C 251.02819,49.245491 249.01221,47.277504 245.17225,46.89348 C 241.90825,46.893506 239.94027,48.429496 239.26828,51.501455 C 239.17227,51.981473 239.12427,52.41347 239.12428,52.797448 L 239.12428,69.213357 C 239.12427,70.749351 238.35628,71.853344 236.8203,72.525339 C 236.43629,72.813337 235.95629,72.957336 235.3803,72.957336 C 233.74831,72.957336 232.59631,72.189341 231.92432,70.653349 C 231.73232,70.173355 231.63632,69.693358 231.63632,69.213357 L 231.63632,52.797448 M 272.44546,25.1496 C 273.59744,25.149648 274.55744,25.533645 275.32545,26.301594 C 276.09343,27.069635 276.42942,27.981629 276.33344,29.037578 L 276.33344,38.973524 L 281.08541,38.973524 C 282.62138,38.973558 283.77338,39.645553 284.54139,40.989513 C 285.30937,42.141537 285.30937,43.389529 284.54139,44.733492 C 283.77338,46.077511 282.62138,46.701507 281.08541,46.605482 L 276.33344,46.605482 L 276.33344,61.581399 C 276.33343,63.021401 276.57342,63.981395 277.05344,64.461383 C 277.34142,64.845389 277.82142,65.085388 278.49343,65.181379 C 279.26141,65.469385 280.2214,65.421385 281.37341,65.03738 C 282.90938,64.557391 284.25337,64.893389 285.40539,66.045375 C 286.36536,67.005375 286.65336,68.253367 286.26939,69.789354 C 285.88536,71.229348 284.97337,72.141342 283.5334,72.525339 L 280.79742,72.957336 C 276.57342,73.245335 273.40544,72.093342 271.29347,69.501355 C 269.56547,67.485372 268.70148,64.845389 268.70148,61.581399 L 268.70148,46.605482 L 266.39749,46.605482 C 264.8615,46.701507 263.75751,46.077511 263.08551,44.733492 C 262.31752,43.389529 262.31752,42.141537 263.08551,40.989513 C 263.75751,39.645553 264.8615,38.973558 266.39749,38.973524 L 268.70148,38.973524 L 268.70148,29.037578 C 268.70148,27.501632 269.37347,26.30164 270.71747,25.437598 C 271.29346,25.245647 271.86945,25.149648 272.44546,25.1496 M 293.87998,38.685525 C 294.93597,38.68556 295.89596,39.069557 296.75997,39.837519 C 297.52795,40.605547 297.91195,41.565541 297.91196,42.717503 L 297.91196,59.133413 C 297.91195,60.477418 298.15195,61.58141 298.63196,62.445394 C 299.30394,63.693397 300.11994,64.509391 301.07994,64.893381 C 301.94392,65.181387 302.90392,65.325386 303.95993,65.325378 C 306.3599,65.325386 307.99188,64.605391 308.8559,63.16539 L 309.2879,62.445394 C 309.76787,61.389412 310.00787,60.285419 310.00789,59.133413 L 310.00789,42.717503 C 310.00787,41.181543 310.67987,40.029551 312.02388,39.261522 C 313.36785,38.493561 314.61584,38.493561 315.76786,39.261522 C 317.11183,40.029551 317.78382,41.181543 317.78385,42.717503 L 317.78385,59.133413 C 317.20782,65.757383 314.23184,70.077355 308.8559,72.093341 C 307.31989,72.669338 305.6879,72.957336 303.95993,72.957336 C 299.35194,72.957336 295.75196,71.229348 293.15999,67.773365 C 292.67998,67.197374 292.24799,66.573378 291.86399,65.901375 C 290.712,63.693397 290.136,61.437411 290.136,59.133413 L 290.136,42.717503 C 290.136,40.989545 290.856,39.789552 292.29599,39.117523 C 292.77598,38.829559 293.30398,38.68556 293.87998,38.685525"
-         id="text2284"
-         style="font-size:39.99980164px;font-style:normal;font-weight:normal;fill:#033c71;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Ubuntu-Title" />
-      <path
-         d="M 98.383398,38.829522 C 99.631385,38.829557 100.63938,39.309554 101.40738,40.269515 L 109.18334,49.917461 L 116.9593,40.269515 C 117.91927,39.117555 119.11926,38.637558 120.55928,38.829522 C 121.99924,39.117555 123.00723,39.93355 123.58326,41.277509 C 124.06323,42.621532 123.82323,43.869524 122.86326,45.021488 L 114.07931,55.965428 L 122.86326,66.765369 C 123.82323,67.917367 124.06323,69.213359 123.58326,70.653347 C 123.00723,71.997341 121.99924,72.765336 120.55928,72.957334 C 119.11926,73.245333 117.91927,72.813335 116.9593,71.661342 L 109.18334,62.013395 L 101.40738,71.661342 C 100.44738,72.813335 99.247387,73.245333 97.807401,72.957334 C 96.367406,72.765336 95.359413,71.997341 94.783418,70.653347 C 94.303419,69.213359 94.543418,67.917367 95.503414,66.765369 L 104.28737,55.965428 L 95.503414,45.021488 C 94.447418,43.773525 94.25542,42.429533 94.927417,40.989511 C 95.599411,39.549552 96.751403,38.829557 98.383398,38.829522"
-         id="text3378"
-         style="font-size:39.99980164px;font-style:normal;font-weight:normal;fill:#033c71;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Ubuntu-Title" />
-    </g>
-    <path
-       d="M 48.170328,38.523239 C 56.951238,38.523239 64.234688,45.042968 65.440648,53.494696 L 77.521798,53.494696 C 76.972658,46.853448 74.219248,40.663667 69.616138,35.7806 C 66.667378,37.283437 63.041798,37.311894 59.962288,35.533716 C 56.880478,33.75477 55.092298,30.59835 54.920788,27.290416 C 52.732678,26.780498 50.472268,26.515156 48.170328,26.515156 C 43.762568,26.515156 39.502478,27.47731 35.629248,29.302403 L 41.676748,39.778423 C 43.684888,38.969322 45.876848,38.523239 48.170328,38.523239 z"
-       id="path2111"
-       style="fill:#639ad2;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M 65.442188,58.439291 C 64.238528,66.894864 56.952768,73.418438 48.170328,73.418438 C 45.874538,73.418438 43.683348,72.971587 41.673668,72.162485 L 35.626178,82.638503 C 39.500178,84.465135 43.761028,85.427289 48.170328,85.427289 C 50.474578,85.427289 52.737288,85.162716 54.926938,84.651259 C 55.096148,81.340251 56.883548,78.179217 59.969218,76.397963 C 63.048718,74.619016 66.675838,74.648242 69.625368,76.151848 C 74.225398,71.268781 76.975728,65.079769 77.523338,58.44006 L 65.442188,58.44006 L 65.442188,58.439291 z"
-       id="path2113"
-       style="fill:#23507b;fill-opacity:1" />
-    <circle
-       cx="98.936996"
-       cy="9.1700001"
-       r="9.1680002"
-       transform="matrix(0.769108,0,0,0.769108,-11.074807,19.723139)"
-       id="circle2117"
-       style="fill:#10518b;fill-opacity:1" />
-    <circle
-       cx="33.206001"
-       cy="47.130001"
-       r="9.1680002"
-       transform="matrix(0.769108,0,0,0.769108,-11.074807,19.723139)"
-       id="circle2107"
-       style="fill:#4b9aeb;fill-opacity:1" />
-    <path
-       d="M 30.723108,55.971223 C 30.723108,50.412111 33.335768,45.452902 37.397428,42.25572 L 31.350698,31.782008 C 29.932468,32.772619 28.590378,33.894747 27.342111,35.14301 C 23.84267,38.64322 21.332301,42.868699 19.951753,47.479502 C 22.734385,49.281522 24.577168,52.410253 24.577168,55.971992 C 24.577168,59.533732 22.734385,62.662463 19.951753,64.463714 C 21.332301,69.076054 23.84267,73.300765 27.342111,76.799437 C 28.589608,78.048468 29.930928,79.169059 31.347628,80.15967 L 37.395898,69.684419 C 33.334228,66.486468 30.723108,61.528029 30.723108,55.971223 z"
-       id="path2115"
-       style="fill:#b4d1ea;fill-opacity:1" />
-    <circle
-       cx="98.945"
-       cy="85.073997"
-       r="9.1689997"
-       transform="matrix(0.769108,0,0,0.769108,-11.074807,19.723139)"
-       id="circle3484"
-       style="fill:#83bef1;fill-opacity:1" />
-    <path
-       d="M 48.170328,38.523239 C 56.951238,38.523239 64.234688,45.042968 65.440648,53.494696 L 77.521798,53.494696 C 76.972658,46.853448 74.219248,40.663667 69.616138,35.7806 C 66.667378,37.283437 63.041798,37.311894 59.962288,35.533716 C 56.880478,33.75477 55.092298,30.59835 54.920788,27.290416 C 52.732678,26.780498 50.472268,26.515156 48.170328,26.515156 C 43.762568,26.515156 39.502478,27.47731 35.629248,29.302403 L 41.676748,39.778423 C 43.684888,38.969322 45.876848,38.523239 48.170328,38.523239 z"
-       id="path3679"
-       style="fill:#639ad2;fill-opacity:0;stroke:none;stroke-opacity:1" />
-    <path
-       d="M 30.723108,55.971223 C 30.723108,50.412111 33.335768,45.452902 37.397428,42.25572 L 31.350698,31.782008 C 29.932468,32.772619 28.590378,33.894747 27.342111,35.14301 C 23.84267,38.64322 21.332301,42.868699 19.951753,47.479502 C 22.734385,49.281522 24.577168,52.410253 24.577168,55.971992 C 24.577168,59.533732 22.734385,62.662463 19.951753,64.463714 C 21.332301,69.076054 23.84267,73.300765 27.342111,76.799437 C 28.589608,78.048468 29.930928,79.169059 31.347628,80.15967 L 37.395898,69.684419 C 33.334228,66.486468 30.723108,61.528029 30.723108,55.971223 z"
-       id="path3691"
-       style="fill:#b4d1ea;fill-opacity:0" />
-    <path
-       d="M 65.442188,58.439291 C 64.238528,66.894864 56.952768,73.418438 48.170328,73.418438 C 45.874538,73.418438 43.683348,72.971587 41.673668,72.162485 L 35.626178,82.638503 C 39.500178,84.465135 43.761028,85.427289 48.170328,85.427289 C 50.474578,85.427289 52.737288,85.162716 54.926938,84.651259 C 55.096148,81.340251 56.883548,78.179217 59.969218,76.397963 C 63.048718,74.619016 66.675838,74.648242 69.625368,76.151848 C 74.225398,71.268781 76.975728,65.079769 77.523338,58.44006 L 65.442188,58.44006 L 65.442188,58.439291 z"
-       id="path3719"
-       style="fill:#23507b;fill-opacity:0" />
-    <g
-       id="g3583">
-      <path
-         d="M 24.061618,45.222977 C 24.182455,45.202763 27.195524,46.793186 29.220781,47.342794 C 32.832196,48.265693 36.128715,51.043377 37.72206,52.638967 C 37.840199,52.775526 39.090573,51.702815 40.399121,51.780079 C 42.18652,51.888338 47.717183,53.4435 48.456125,52.38449 C 48.904214,51.762784 48.872098,51.000028 49.431138,50.687603 C 49.732108,50.603377 48.312384,48.006724 49.821276,47.17479 C 50.897132,46.637087 51.808803,49.64746 52.085062,49.984816 C 52.208817,50.13575 52.865338,50.172585 52.787627,49.828716 C 52.703401,49.455199 51.641465,46.566561 52.943724,46.081865 C 55.058825,45.244315 54.683962,49.777955 54.738985,49.906878 C 54.85601,50.181345 62.105337,50.392922 62.54489,53.653729 C 62.799141,55.448318 56.737069,57.767808 56.144115,58.18108 C 55.551386,58.594353 55.600792,59.255363 55.831913,59.664368 C 56.097621,60.107962 57.863686,61.605175 57.627398,62.318293 C 57.465011,62.730218 54.168945,61.220427 53.958491,61.537793 C 53.478511,62.144001 56.357938,63.661428 55.363614,64.738182 C 54.969432,64.996028 50.434216,62.839376 50.445673,62.864756 C 50.323939,62.911025 44.03726,64.013158 39.205118,62.552332 C 39.034868,62.504266 36.103784,65.383695 35.770472,65.284644 C 35.314749,65.117539 36.442263,62.780305 36.316933,62.318293 C 36.112094,62.060897 34.239119,63.363378 34.131308,62.708657 C 34.002385,61.848197 35.774963,60.859038 35.692533,60.288768 C 35.235463,57.049074 35.896698,55.157231 37.019494,53.575791 C 37.393915,52.993616 32.619046,49.387817 29.16216,47.964724 C 25.705498,46.54163 23.856105,45.335504 24.061618,45.222977 z"
-         id="path14"
-         style="fill:#0a2a49;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.22460442pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 55.12719,56.055065 C 55.089224,55.922549 57.486208,54.472727 57.833223,54.80604 C 58.457844,55.032441 55.149197,56.223293 55.12719,56.055065 z"
-         id="path7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.13476264pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 56.271995,57.373493 C 56.060868,57.245917 57.706995,55.326448 58.110829,55.534657 C 58.700414,56.120425 56.244372,57.419087 56.271995,57.373493 z"
-         id="path8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.13476264pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 62.759692,48.49196 C 62.559572,48.326427 60.990258,50.802466 61.337271,51.059413 C 61.545928,51.215514 62.849085,48.58023 62.759692,48.49196 z"
-         id="path13"
-         style="fill:#0a2a49;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.13476264pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <ellipse
-         cx="288.86475"
-         cy="374.58655"
-         rx="3.012037"
-         ry="3.398196"
-         transform="matrix(0.2078264,0,0,0.2097329,-4.371806,-26.527264)"
-         id="ellipse17"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.6pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 60.955646,48.14503 C 60.856601,48.030032 60.331025,50.698332 60.574044,50.816474 C 60.7827,50.972575 61.146114,48.283835 60.955646,48.14503 z"
-         id="path18"
-         style="fill:#0a2a49;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.13476264pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 54.25687,51.756136 C 53.634487,52.196137 54.598493,54.686101 56.183974,53.232237 C 54.938318,53.268847 54.522794,52.904089 54.25687,51.756136 z"
-         id="path21"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0a2a49;stroke-width:0.13476264pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
 
=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2012-02-15 00:11:21 +0000
+++ data/whitelists/default.whitelist	2012-06-23 00:59:17 +0000
@@ -12,11 +12,17 @@
 sleep
 display
 optical_drive
+block_device
 __audio__
 audio/alsa_record_playback_external
 audio/alsa_record_playback_internal
 audio/alsa_record_playback_usb
 audio/playback_auto
+__benchmarks__
+benchmarks/disk/hdparm-read
+benchmarks/disk/hdparm-read_.*
+benchmarks/disk/hdparm-cache-read
+benchmarks/disk/hdparm-cache-read_.*
 __bluetooth__
 bluetooth/detect-output
 __camera__
@@ -28,8 +34,6 @@
 cpu/topology
 cpu/clocktest
 __disk__
-disk/benchmarks
-disk/benchmark_sd\w
 disk/detect
 __firewire__
 firewire/insert
@@ -59,6 +63,7 @@
 input/keyboard
 input/mouse
 __keys__
+keys/super
 keys/battery-info
 keys/brightness
 keys/media-control
 
=== added file 'data/whitelists/smoke.whitelist'
--- data/whitelists/smoke.whitelist	1970-01-01 00:00:00 +0000
+++ data/whitelists/smoke.whitelist	2012-06-23 00:59:17 +0000
@@ -0,0 +1,25 @@
+## This is an example whitelist to start from.
+## To use, copy this file and add the jobs you want to run to the copy. Delete
+## these comments. DO NOT delete the first 9 jobs in tis file. They are resource
+## gathering jobs and are necessary to do any testing at all.
+# Resource Jobs (listed in jobs/resource.txt)
+cpuinfo
+cdimage
+dmi
+dpkg
+gconf
+lsb
+meminfo
+module
+package
+device
+uname
+# Smoke test cases
+__smoke__
+smoke/true
+smoke/false
+smoke/dependency/good
+smoke/dependency/bad
+smoke/requirement/good
+smoke/requirement/bad
+smoke/manual
 
=== added file 'data/whitelists/sniff.whitelist'
--- data/whitelists/sniff.whitelist	1970-01-01 00:00:00 +0000
+++ data/whitelists/sniff.whitelist	2012-06-23 00:59:17 +0000
@@ -0,0 +1,25 @@
+## This is an example whitelist to start from.
+## To use, copy this file and add the jobs you want to run to the copy. Delete
+## these comments. DO NOT delete the first 9 jobs in tis file. They are resource
+## gathering jobs and are necessary to do any testing at all.
+# Resource Jobs (listed in jobs/resource.txt)
+cpuinfo
+cdimage
+dmi
+dpkg
+gconf
+lsb
+meminfo
+module
+package
+device
+uname
+# Smoke sniffcases
+__sniff__
+sniff/sniff7
+sniff/sniff6
+sniff/sniff5
+sniff/sniff4
+sniff/sniff3
+sniff/sniff2
+sniff/sniff1
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-04-11 17:20:37 +0000
+++ debian/changelog	2012-06-23 00:59:17 +0000
@@ -1,3 +1,218 @@
+checkbox (0.14) quantal; urgency=low
+
+  * New upstream release (LP: #1016746):
+
+  [Aurelien Gateau]
+  * lib/template.py, lib/template_i18n.py, plugins/jobs_info.py,
+    plugins/suites_prompt.py: Add a "sortkey" attribute to jobs, the sortkey
+    order matches the order in which they appear in jobfiles.
+  * checkbox_gtk/gtk_interface.py: Shows jobs and suites in sortkey order
+    (that is, as they appear in job definition files, rather than
+    alphabetically).
+  * checkbox_gtk/gtk_interface.py, gtk/checkbox-gtk.ui,
+    plugins/jobs_prompt.py: Added a progress bar showing tests completed and
+    total.
+
+  [Brendan Donegan]
+  * jobs/suspend.txt.in: Fixed dependencies on wireless and suspend_advanced
+    jobs.
+  * Changed screenshot jobs to use /dev/external_webcam which will be set by
+    a udev rule (LP: #956885)
+  * [FEATURE] Added touchpad tests from CE QA Checkbox to allow touchpad
+    testing to be performed
+  * [FEATURE] Python 2 to 3 conversion:
+    * scripts/create_connection - switched to using argparse and fixed
+      representation of octal literal
+    * scripts/internet_test - ran 2to3 tool and decoded result of
+      check_output. Also replaced optparse with argparse
+    * scripts/memory_info
+    * scripts/removable_storage_test - ran 2to3 tool and fixed some
+      encoding issues
+    * scripts/removable_storage_watcher - ran 2to3 tool and swapped
+      use of gobject with gi.repository.GObject
+    * scripts/xrandr_cycle - ran 2to3 tool and fixed encoding issue
+    * scripts/obex_send - ran 2to3 tool and swapped
+      use of gobject with gi.repository.GObject
+  * Update touchpad.py to use gsettings instead of deprecated gconf
+    (LP: #1004212)
+  * Instead of checking output of nmcli con up in create_connection,
+    check the return code is success instead (LP: #1013537)
+  * base64 encode the after suspend screenshot attachement so that it can
+    be uploaded properly (LP: #1016126)
+  * Fixed simple type in xorg_memory_test, introduced by Python3
+    conversion (LP: #1016387)
+  * [FEATURE] Add suspend/bluetooth_obex_after_suspend_auto test to be
+    used during fully automated SRU testing
+
+  [Daniel Manrique]
+  * Tweaks to internet_test: don't try to ping an IP that's unreachable from
+    the specified interface (or at all), try to find something pingable via
+    other means.
+  * Reverted feature to keep tests ordered, as the sortkey attribute causes
+    undesirable secondary effects.
+  * New version 0.14 for Quantal Quetzal development.
+  * Set the correct user (root) for fwts-wakealarm test (LP: #1004102)
+  * Set correct user (root) for usb/storage-preinserted, so it works correctly
+    on servers (LP: #1004131)
+  * Log (at level INFO) name of each message we execute, so the currently
+    running job can be determined by looking at the logfile, rather than
+    hunting through process lists.
+  * [FEATURE] Added script and jobs to collect and attach output from
+    alsa-info.sh.
+  * Assume utf-8 encoding always, when opening template files.
+    (LP: #1015174)
+  * [FEATURE] Replaced the context menu in the selection tree with explicit
+    "select/deselect all" buttons.
+
+  [Javier Collado]
+  * Updated camera_test script to use better tool for capturing the image
+    and allow specifying a device to use, plus other improvements. Create a
+    job which takes a capture from the webcam of the desktop.
+  * Added jobs to take screenshots after suspend and attach the resulting jpg
+  * [FEATURE] Added smoke test jobs, whitelist and local job to use for
+    checkbox development purposes.
+  * Fixed "camera_test detect" problem with missing args attributes (LP:
+    #967419)
+  * Submission screen in Qt interface updated to support certification client:
+    - customize contents depending on the upload target (launchpad or certification)
+    - display links to the report properly in the show_entry method
+  * Fixed qt interface show_entry method preopulates widget that gets
+    user input (LP: #1000451)
+  * Added customizable deselect_warning message in qt show_tree method (LP: #1000443)
+  * show_error method shows long text properly in gtk/qt interfaces (LP:
+    #1012052)
+
+  [Jeff Lane]
+  * Created automated version of optical/read for server testing
+    Fixed issues with optical_read_test script:
+    - test could pass if /dev/cdrom did not exist
+    - test could pass if /dev/cdrom was inaccessible
+    - test could pass if no optical device was passed in (LP: #945178)
+  * Removed hard coded paths from scripts (LP: #949435)
+  * Removed files in /data that are not used in any job descriptions
+    (LP: #957396)
+  * [FEATURE] Modified stress jobs so that they are all automated per decision
+     made during the cert sprint.
+  * [FEATURE] Changes to Power Management testing in Checkbox:
+    * scripts/pm_test: added a slightly modified version of OEM team's pm.py
+      script for reboot/poweroff testing
+    * jobs/hibernate.txt.in: modified hibernate test to use fwts and added new
+      jobs to attach log files from hibernate testing.
+    * jobs/power-management.txt.in: added new poweroff and reboot jobs using pm_test
+      script. Added jobs to attach logs from reboot and poweroff tests to
+      results.
+    * jobs/stress.txt.in: modified suspend_30_cycles and hibernate_30_cycles to
+      use fwts. Added jobs to attach logs from 30 cycle tests to results.
+    * jobs/suspend.txt.in: Modified suspend_advanced and suspend_advanced_auto to use
+      fwts. Added job to attach log from suspend_advanced and suspend_advanced_auto
+      to results.
+  * [FEATURE] jobs/miscellanea.txt.in: added a job to gather tester info for
+    certification purposes. Not to be used for UF.
+  * [FEATURE] Python 2 to 3 conversion:
+    * scripts/cpu_topology: ran 2to3, made modificates based on code review and
+      tested script to verify functionality.
+    * scripts/disk_smart: ported to Python 3. Inserted bits to decode byte
+      data returned by Popen. Fixed list_handler to decode bytes types to clean
+      up debug output.  Added bits to improve debug output. Migrated from
+      optparse to argparse.
+    * scripts/network_check: ran 2to3 and that was all that was needed. Also
+      took the liberty of migrating from optparse to ArgParse sine we're
+      Python3 only now.
+    * scripts/network_device_info: ran 2to3 and changed shebang.
+    * scripts/network_info: ran 2to3 and changed shebang. Fixed encoding issue
+      with interface[:15] (needed to be a bytes object).
+    * scripts/fwts_test: ran 2to3 and changed shebang, fixed an encoding bug
+      with Popen output. Cleaned up the final output to be more useful for
+      debugging test failures.
+    * scripts/keyboard_test: nothing to do for conversion beyond changing shebang.
+    * scripts/network_ntp_test: 2to3 changed nothing, so modified shebang.
+      Fixed an encoding issue with Popen output in. Re-inserted a call to
+      SilentCall() that was removed from TimeSkew() by someone in a previous
+      revision, which made the TimeSkew() function do nothing. Fixed an
+      unbuffered I/O error in SilentCall() discovered while testing Python3
+      changes.
+    * scripts/optical_detect, scripts/optical_read_test: ran 2to3 and changed
+      shebang. Changes were minimal.
+    * scripts/xorg_memory_test: 2to3 made minimal changes, modifed shebang.
+      Converted optparse code to argparse code and replaced sys.argv[] stuff
+      with more useful positional arguments. Removed a redundant import that
+      2to3 injected.
+    * scripts/resolution_test: ran 2to3 with minimal changes. Changed shebang.
+      Converted optparse to argparse and removed unnecessary calls to
+      sys.argv[]
+    * scripts/pm_log_check: ran 2to3 and changed shebang.
+    * scripts/pm_test: ran 2to3 and changed shebang. After a lot of trial and
+      error, changed the way xinput is called to avoid confusing bytecode
+      embedded in the command output that was causing problems with
+      bytes.decode() on the "after reboot" hardware checks.
+
+  [Jeff Marcom]
+  * [FEATURE] Python 2 to 3 conversion:
+    * scripts/memory_info
+    * scripts/memory_test
+    * scripts/touchpad_test
+  * Deprecated: wake_on_lan_test
+  * Update touchpad.py to use gsettings instead of deprecated gconf
+    (LP: #1004212)
+
+  [Marc Tardif]
+  * [FEATURE] Reworked media_keys_test into key_test, making it more generic
+    and able to test for any key that sends an scancode. Used it to implement
+    a test for the Super key.
+  * [FEATURE] Added new interactive and auto-verifying touchpad scrolling
+    test.
+  * [FEATURE] Python 2 to 3 conversion:
+    * scripts/ansi_parser
+    * scripts/cking_suite
+    * scripts/floppy_test
+    * scripts/network_bandwidth_test
+    * scripts/cpu_scaling_test
+  * Removed sleep_test script no longer used by any test definition.
+  * [FEATURE] Deprecated scripts:
+    * scripts/autotest_filter and scripts/autotest_suite
+    * scripts/ltp_filter and scripts/ltp_suite
+    * scripts/mago_filter and scripts/mago_suite
+    * scripts/qa_regression_suite
+  * [FEATURE] Reworked media_keys_test into key_test, making it more generic
+    and able to test for any key that sends an scancode. Used it to implement
+    a test for the Super key.
+  * [FEATURE] Added new interactive and auto-verifying touchpad scrolling
+    test.
+  * Removed sleep_test script no longer used by any test definition.
+  * Migrated project minus scripts to Python 3.
+
+  [Sylvain Pineau]
+  * Updated gst_pipeline_test to add a --fullscreen option for video playback.
+  * Add python-gtk2 dependency, Gst from gi.repository don't work well with
+    messages (See https://bugzilla.gnome.org/show_bug.cgi?id=631901).
+  * Add a new job to capture screen during fullscreen video playback.
+  * qt/frontend/qtfront.cpp, qt/frontend/qtfront.h, plugins/suites_prompt.py,
+    checkbox_qt/qt_interface.py, plugins/jobs_prompt.py: The selection tree is
+    now updated when recovering from a previous run (LP: #937696)
+  * [FEATURE] Python 2 to 3 conversion:
+    * scripts/gst_pipeline_test. Migrated to PyGI.
+    * scripts/removable_resource: Add a resource job to identify removable
+      block devices. __disks__ jobs updated to run only on internal drives.
+  * [FEATURE] jobs/benchmarks.txt.in, scripts/pts_run: Add a reworked launcher
+    for phoronix-test-suite tests.
+  * [FEATURE] Python 2 to 3 conversion:
+  * jobs/stress.txt.in: add OEM team's stress tests (including reboot and poweroff)
+    and log analysis jobs
+
+  [Tiago Salem Herrmann]
+  * checkbox_qt/qt_interface.py, qt/frontend/qtfront.cpp,
+    qt/frontend/qtfront.h, qt/frontend/treemodel.cpp, qt/frontend/treemodel.h:
+    Makes it possible for the job selection tree to have more than 2 levels of
+    children nodes.
+  * checkbox/user_interface.py, checkbox_qt/qt_interface.py,
+    plugins/user_interface.py, qt/frontend/qtfront.cpp, qt/frontend/qtfront.h:
+    Correctly update automated test execution status in the Selection tab
+    (LP: #950105).
+  * qt/frontend/qtfront.cpp: Avoid QDBusArgument warnings when running
+    checkbox-qt from a terminal (LP: #957476)
+
+ -- Marc Tardif <[e-mail]>  Fri, 22 Jun 2012 17:04:14 -0400
+
 checkbox (0.13.7) precise; urgency=low
 
   * New upstream release (LP: #980063)
 
=== modified file 'debian/checkbox.dirs'
--- debian/checkbox.dirs	2009-03-17 09:46:16 +0000
+++ debian/checkbox.dirs	2012-06-23 00:59:17 +0000
@@ -1,2 +1,3 @@
 etc/checkbox.d
+usr/share/icons
 usr/share/locale
 
=== modified file 'debian/control'
--- debian/control	2012-03-07 19:46:29 +0000
+++ debian/control	2012-06-23 00:59:17 +0000
@@ -3,24 +3,58 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.2
-X-Python-Version: >= 2.6
-Build-Depends: debhelper (>= 7.0.50~), dh-translations, libqt4-dev, python (>= 2.6.6-3~), po-debconf, python-distutils-extra, qt4-qmake
+X-Python3-Version: >= 3.2
+Build-Depends: debhelper (>= 9.2),
+               dh-translations,
+               libqt4-dev,
+               po-debconf,
+               python3 (>= 3.2),
+               python3-distutils-extra,
+               qt4-qmake
 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
 
 Package: checkbox
 Section: python
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, debconf, python-libxml2, udev
-Recommends: dpkg (>= 1.13), gstreamer0.10-gconf, lsb-release, perl, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10
-Suggests: checkbox-cli | checkbox-gtk, bonnie++, bootchart, bzr, cvs, ethtool, flex, fwts, git-core, hdparm, lshw, make, nmap, obexd-client, python-pexpect, smartmontools, sox, stress, wodim
-Description: System testing application 
+Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}
+Recommends: dpkg (>= 1.13),
+            gir1.2-gst-plugins-base-0.10 | gir1.2-gst-plugins-base-1.0,
+            gstreamer0.10-gconf | gstreamer1.0-plugins-good,
+            lsb-release,
+            perl,
+            pm-utils,
+            python-apport,
+            python-apt,
+            python3-dbus,
+            python3-gi
+Suggests: bonnie++,
+          bootchart,
+          checkbox-cli | checkbox-gtk,
+          ethtool,
+          fwts,
+          git-core,
+          glmark2,
+          glmark2-es2,
+          hdparm,
+          lshw,
+          mesa-utils,
+          nmap,
+          obexd-client,
+          render-bench,
+          smartmontools,
+          sox,
+          stress,
+          sysstat,
+          wmctrl,
+          wodim
+Description: System testing application
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
 
 Package: checkbox-cli
 Architecture: all
 Depends: checkbox (>= ${source:Version}), ${misc:Depends}
-Description: Command line interface for checkbox 
+Description: Command line interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
  .
@@ -28,18 +62,23 @@
 
 Package: checkbox-urwid
 Architecture: all
-Depends: checkbox (>= ${source:Version}), python-urwid, ${misc:Depends}
-Description: Urwid interface for checkbox 
+Depends: checkbox (>= ${source:Version}), python3-urwid, ${misc:Depends}
+Description: Urwid interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
  .
- This package provides a command line interface (urwid version) for 
+ This package provides a command line interface (urwid version) for
  answering tests.
 
 Package: checkbox-gtk
 Section: gnome
 Architecture: all
-Depends: checkbox (>= ${source:Version}), gksu, python-gobject (>= 2.28), gir1.2-gtk-3.0, python-cairo, ${misc:Depends}
+Depends: checkbox (>= ${source:Version}),
+         gir1.2-gtk-3.0,
+         gksu,
+         python3-gi,
+         python3-gi-cairo,
+         ${misc:Depends}
 Description: GTK interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -48,7 +87,11 @@
 
 Package: checkbox-qt
 Architecture: any
-Depends: checkbox (>= ${source:Version}), libqtgui4, libqt4-dbus, ${misc:Depends}
+Depends: checkbox (>= ${source:Version}),
+         libqt4-dbus,
+         libqtgui4,
+         python3-dbus,
+         ${misc:Depends}
 Description: QT4 interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
 
=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2012-04-02 15:22:05 +0000
+++ debian/po/ast.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 04:43+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2012-03-21 02:22:11 +0000
+++ debian/po/cs.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/de.po'
--- debian/po/de.po	2012-03-21 02:22:11 +0000
+++ debian/po/de.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2012-03-21 02:22:11 +0000
+++ debian/po/en_AU.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2012-03-21 02:22:11 +0000
+++ debian/po/en_GB.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2012-04-11 17:20:37 +0000
+++ debian/po/es.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-07 04:33+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
@@ -75,8 +75,7 @@
 #. Description
 #: ../checkbox.templates:4001
 msgid "List of jobs to run when testing with checkbox."
-msgstr ""
-"Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
+msgstr "Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2012-03-21 02:22:11 +0000
+++ debian/po/fr.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/he.po'
--- debian/po/he.po	2012-03-21 02:22:11 +0000
+++ debian/po/he.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2012-03-21 02:22:11 +0000
+++ debian/po/hu.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2012-03-21 02:22:11 +0000
+++ debian/po/it.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2012-03-21 02:22:11 +0000
+++ debian/po/ja.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
@@ -31,8 +31,9 @@
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
 msgstr ""
-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどうか、checkboxが確認するようになります。これはapportが有効になって"
-"いなくても機能します。"
+"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
+"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
+"能します。"
 
 #. Type: string
 #. Description
@@ -46,7 +47,9 @@
 msgid ""
 "When filing a new bug through checkbox, if it does not guess the  package, "
 "the default package that the bug will be file against."
-msgstr "checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デフォルトのパッケージ名を用いて報告します。"
+msgstr ""
+"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
+"フォルトのパッケージ名を用いて報告します。"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-03-21 02:22:11 +0000
+++ debian/po/nl.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2012-03-21 02:22:11 +0000
+++ debian/po/oc.po	2012-06-23 00:59:17 +0000
@@ -11,12 +11,12 @@
 "PO-Revision-Date: 2012-02-24 07:45+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <[e-mail]>\n"
 "Language-Team: Occitan (post 1500) <[e-mail]>\n"
-"Language: oc\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2012-03-21 02:22:11 +0000
+++ debian/po/pl.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2012-03-21 02:22:11 +0000
+++ debian/po/pt_BR.po	2012-06-23 00:59:17 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
-"PO-Revision-Date: 2011-09-16 19:04+0000\n"
-"Last-Translator: André Gondim <Unknown>\n"
+"PO-Revision-Date: 2012-05-12 03:33+0000\n"
+"Last-Translator: eniomarconcini <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
@@ -31,15 +31,15 @@
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
 msgstr ""
-"Se esta opção está definido como Sim, então a caixa de verificação irá "
-"perguntar se o usuário quer relatar o erro no teste falho, mesmo se o apport "
-"não estiver habilitado."
+"Se esta opção for definida como Sim, então o Checkbox irá perguntar se o "
+"usuário quer relatar o erro dos testes que falharam, mesmo que o Apport não "
+"esteja habilitado."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:2001
 msgid "Default package to report bugs against:"
-msgstr ""
+msgstr "Pacote padrão para relatar erros:"
 
 #. Type: string
 #. Description
@@ -48,42 +48,48 @@
 "When filing a new bug through checkbox, if it does not guess the  package, "
 "the default package that the bug will be file against."
 msgstr ""
+"Quando estiver registrando um novo erro através do Checkbox, se ele não "
+"adivinhar o pacote, o pacote padrão do qual o erro será relatado."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:3001
 msgid "Test suite blacklist:"
-msgstr ""
+msgstr "Lista negra da suíte de testes:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:3001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
+"Lista de arquivos de trabalho para nunca serem executados quando estiver "
+"testando com checkbox."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:4001
 msgid "Test suite whitelist:"
-msgstr ""
+msgstr "Lista branca da suíte de testes:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:4001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
+"Lista de arquivos de trabalho para executar enquanto estiver testando com "
+"checkbox."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:5001
 msgid "Transport URL:"
-msgstr ""
+msgstr "Transportar URL:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:5001
 msgid "URL where to send submissions."
-msgstr "URL para enviar submissões"
+msgstr "URL para enviar relatórios."
 
 #. Type: string
 #. Description
@@ -95,7 +101,7 @@
 #. Description
 #: ../checkbox.templates:6001
 msgid "E-mail address used to sign in to Launchpad."
-msgstr ""
+msgstr "Endereço de e-mail usado para entrar no Launchpad."
 
 #. Type: string
 #. Description
@@ -107,16 +113,16 @@
 #. Description
 #: ../checkbox.templates:7001
 msgid "HTTP proxy to use instead of the one specified in environment."
-msgstr ""
+msgstr "Proxy HTTP para usar em vez do especificado pelo ambiente."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:8001
 msgid "HTTPS Proxy:"
-msgstr "HTTPS Proxy:"
+msgstr "Proxy HTTPS:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:8001
 msgid "HTTPS proxy to use instead of the one specified in environment."
-msgstr ""
+msgstr "Proxy HTTPS para usar em vez do especificado pelo ambiente."
 
=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2012-03-21 02:22:11 +0000
+++ debian/po/ro.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2012-03-21 02:22:11 +0000
+++ debian/po/ru.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== added file 'debian/po/tr.po'
--- debian/po/tr.po	1970-01-01 00:00:00 +0000
+++ debian/po/tr.po	2012-06-23 00:59:17 +0000
@@ -0,0 +1,119 @@
+# Turkish translation for checkbox
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"PO-Revision-Date: 2012-05-18 12:51+0000\n"
+"Last-Translator: Hasan Yılmaz <[e-mail]>\n"
+"Language-Team: Turkish <[e-mail]>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid "Enable bug reporting by default? "
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid ""
+"If this option is set to Yes, then checkbox will ask if the user wants to "
+"file a bug for failing tests, even if apport is not enabled."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid "Default package to report bugs against:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid ""
+"When filing a new bug through checkbox, if it does not guess the  package, "
+"the default package that the bug will be file against."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "Test suite blacklist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "List of job files to never run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "Test suite whitelist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "List of jobs to run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "Transport URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "URL where to send submissions."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "Launchpad E-mail:"
+msgstr "Launchpad E-posta:"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "E-mail address used to sign in to Launchpad."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP proxy to use instead of the one specified in environment."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS proxy to use instead of the one specified in environment."
+msgstr ""
 
=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2012-03-21 02:22:11 +0000
+++ debian/po/uk.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:34+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
 
=== added file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	1970-01-01 00:00:00 +0000
+++ debian/po/zh_CN.po	2012-06-23 00:59:17 +0000
@@ -0,0 +1,119 @@
+# Chinese (Simplified) translation for checkbox
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"PO-Revision-Date: 2012-05-09 02:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid "Enable bug reporting by default? "
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid ""
+"If this option is set to Yes, then checkbox will ask if the user wants to "
+"file a bug for failing tests, even if apport is not enabled."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid "Default package to report bugs against:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid ""
+"When filing a new bug through checkbox, if it does not guess the  package, "
+"the default package that the bug will be file against."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "Test suite blacklist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "List of job files to never run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "Test suite whitelist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "List of jobs to run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "Transport URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "URL where to send submissions."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "Launchpad E-mail:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "E-mail address used to sign in to Launchpad."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP proxy to use instead of the one specified in environment."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS proxy to use instead of the one specified in environment."
+msgstr ""
 
=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2012-03-21 02:22:11 +0000
+++ debian/po/zh_TW.po	2012-06-23 00:59:17 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-15 04:35+0000\n"
-"X-Generator: Launchpad (build 14933)\n"
+"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. Type: boolean
 #. Description
@@ -30,7 +30,9 @@
 msgid ""
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
-msgstr "若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提交失敗測試的臭蟲回報。"
+msgstr ""
+"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
+"交失敗測試的臭蟲回報。"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/rules'
--- debian/rules	2012-02-15 00:11:21 +0000
+++ debian/rules	2012-06-23 00:59:17 +0000
@@ -1,11 +1,18 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with translations,python2
+	dh "$@" --with translations,python3
 
 override_dh_auto_build:
 	(cd qt/frontend; qmake-qt4; make)
-	dh_auto_build
+	set -ex; for python in $(shell py3versions -r); do \
+		$$python setup.py build; \
+	done;
+
+override_dh_auto_install:
+	set -ex; for python in $(shell py3versions -r); do \
+		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done;
 
 override_dh_installdeb:
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
 
=== modified file 'examples/checkbox-qt.ini'
--- examples/checkbox-qt.ini	2012-02-15 00:11:21 +0000
+++ examples/checkbox-qt.ini	2012-06-23 00:59:17 +0000
@@ -12,5 +12,5 @@
 # Class implementing the UserInterface interface.
 interface_class = QTInterface
 
-# Path where GTK files are stored.
+# Path where qt files are stored.
 data_path = %(checkbox_share)s/qt
 
=== modified file 'examples/checkbox.ini'
--- examples/checkbox.ini	2011-11-18 12:46:21 +0000
+++ examples/checkbox.ini	2012-06-23 00:59:17 +0000
@@ -21,6 +21,4 @@
 
 [checkbox/plugins/jobs_info]
 
-# Blacklist of jobs that are potentially dangerous
-blacklist = autotest/full_suite ltp phoronix qa-regression-testing
-  clone06.1 ioctl03.1 lchown02.* swapon03.1
+# Required section so that checkbox.application can match .*/jobs_info/.*
 
=== modified file 'gtk/checkbox-gtk.ui'
--- gtk/checkbox-gtk.ui	2011-11-18 12:46:21 +0000
+++ gtk/checkbox-gtk.ui	2012-06-23 00:59:17 +0000
@@ -165,10 +165,22 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHButtonBox" id="hbuttonbox_test">
+                  <object class="GtkBox" id="hbuttonbox_test">
                     <property name="visible">True</property>
                     <property name="layout_style">end</property>
                     <child>
+                      <object class="GtkProgressBar" id="progressbar_test">
+                        <property name="visible">True</property>