Merge lp:~noskcaj/testdrive/pep8 into lp:testdrive

[Jackson Doak]

makes the program pep8 compliant and adds some minor fixes.

[lp:~noskcaj/testdrive/pep8]

434. By Jackson Doak on 2013-10-06

prevent testdrive from importing gettext twice

435. By Jackson Doak on 2013-10-06

Comment out unused imports

436. By Jackson Doak on 2013-10-06

Fix minor text bugs i made.

[Andres Rodriguez (andreserl)]

Hi Jackson!

I like this fixes for sure.. however, it is way too big to review.. is there anyway you can split this in smaller branches? (Say one branch per binary, so that it is easier to test and review).

thank you! this is awesome!

review: Needs Fixing

[Jackson Doak (noskcaj)]

first, thanks for having time to review.
second, I'll re-do this in separate branches one the PyGI (and maybe
python3) port is over. Is there any chance you could help with either,
since glade keep breaking for me and dan hasn't got the time.

On Sun, Oct 27, 2013 at 5:24 AM, Andres Rodriguez
<email address hidden>wrote:

> Review: Needs Fixing
>
> Hi Jackson!
>
> I like this fixes for sure.. however, it is way too big to review.. is
> there anyway you can split this in smaller branches? (Say one branch per
> binary, so that it is easier to test and review).
>
> thank you! this is awesome!
> --
> https://code.launchpad.net/~noskcaj/testdrive/pep8/+merge/189491
> You are the owner of lp:~noskcaj/testdrive/pep8.
>

Unmerged revisions

436. By Jackson Doak on 2013-10-06

Fix minor text bugs i made.

435. By Jackson Doak on 2013-10-06

Comment out unused imports

434. By Jackson Doak on 2013-10-06

prevent testdrive from importing gettext twice

433. By Jackson Doak on 2013-10-06

* debian/control: Add working VCS fields
  * debian/release.sh: Update current ubuntu release

432. By Jackson Doak on 2013-10-06

Add copyright entry for testdrivegtk/AddOtherTestdrivegtkDialog.py

431. By Jackson Doak on 2013-10-06

Finish pep8 changes

430. By Jackson Doak on 2013-10-05

Make testdrive pep8 compliant

=== modified file 'bin/testdrive'
--- bin/testdrive	2013-08-10 20:52:38 +0000
+++ bin/testdrive	2013-10-06 20:59:44 +0000
@@ -19,11 +19,21 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import commands, hashlib, os, string, sys, tempfile, time, platform, subprocess, tarfile, logging
+import commands
+#import hashlib
+import os
+import string
+import sys
+#import tempfile
+import time
+#import platform
+import subprocess
+import tarfile
+import logging
 from optparse import OptionParser
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
 from testdrive import testdrive
@@ -57,9 +67,12 @@
                 filename = os.path.basename(iso["url"])
                 path = "%s/%s_%s" % (td.CACHE_ISO, iso["category"], filename)
                 if os.path.exists(path):
-                    print(_("     +-cache--> [%s] %s") % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(os.path.getmtime(path))), filename))
-                i=i+1
-                menu.append({"id":i, "url":iso["url"], "cat": iso["category"]})
+                    print(_("     +-cache--> [%s] %s") % (time.strftime(
+                        "%Y-%m-%d %H:%M:%S", time.localtime(
+                          os.path.getmtime(path))), filename))
+                i += 1
+                menu.append({"id": i, "url": iso["url"],
+                             "cat": iso["category"]})
         print(_("  %d. Other (prompt for ISO URL)") % i)
         try:
             input = raw_input(_("\nSelect an image to testdrive [1]: "))
@@ -84,38 +97,46 @@
             logger.error(_("\nERROR: Invalid selection\n"))
     return(url)
 
+
 def error(str):
     logger.error(_("\n%s\n") % str)
     sys.exit(1)
 
+
 def is_iso(file):
     # If it's a URL, assume it's good
     for i in ("http", "ftp", "rsync", "file", "zsync"):
         if string.find(file, "%s://" % i) == 0:
             return(file)
     # If it's a local path, test it for viability
-    if commands.getstatusoutput("file \"%s\" | grep -qs \"ISO 9660\"" % file)[0] == 0:
+    if commands.getstatusoutput("file \"%s\" | grep -qs \"ISO 9660\""
+                                % file)[0] == 0:
         return("file://%s" % file)
     elif tarfile.is_tarfile(file):
         return("file://%s" % file)
     else:
         error(_("Invalid ISO URL [%s]") % file)
 
+
 def is_disk_img(file):
-    (status, output) = commands.getstatusoutput("file %s | grep -qs 'Qemu Image'" % file)
-    if status == 0:
-        # qemu/kvm qcow2 image
-        return True
-    (status, output) = commands.getstatusoutput("file %s | grep -qs 'QEMU QCOW Image'" % file)
-    if status == 0:
-        # qemu/kvm qcow2 image
-        return True
-    (status, output) = commands.getstatusoutput("file %s | grep -qs '.img: data$'" % file)
+    (status, output) = commands.getstatusoutput(
+        "file %s | grep -qs 'Qemu Image'" % file)
+    if status == 0:
+        # qemu/kvm qcow2 image
+        return True
+    (status, output) = commands.getstatusoutput(
+        "file %s | grep -qs 'QEMU QCOW Image'" % file)
+    if status == 0:
+        # qemu/kvm qcow2 image
+        return True
+    (status, output) = commands.getstatusoutput(
+        "file %s | grep -qs '.img: data$'" % file)
     if status == 0:
         # probably a virtual box image
         return True
     return False
 
+
 def is_cloud_img(file):
     img = False
     floppy = False
@@ -136,19 +157,23 @@
     else:
             return False
 
+
 def run(cmd):
     return(os.system(cmd))
 
+
 def run_or_die(cmd):
     if run(cmd) != 0:
         error(_("Command failed\n    `%s`") % cmd)
 
+
 def run_vm(cmd, td, curses):
     if not curses:
         p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
     if td.VIRT == 'kvm':
         if curses:
-            logger.info(_("Launching Virtual Machine using CURSES as screen mode"))
+            logger.info(_(
+                "Launching Virtual Machine using CURSES as screen mode"))
             run_or_die(cmd)
         else:
             p.wait()
@@ -156,15 +181,20 @@
         # Give this VM a few seconds to start up
         time.sleep(5)
         # Loop as long as this VM is running
-        while commands.getstatusoutput("VBoxManage list runningvms | grep -qs %s" % td.VBOX_NAME)[0] == 0:
+        while commands.getstatusoutput(
+                "VBoxManage list runningvms | grep -qs %s" % td.VBOX_NAME
+                )[0] == 0:
             time.sleep(2)
     elif td.VIRT == 'parallels':
         # Loop as long as this VM is running
-        while commands.getstatusoutput("prlctl list %s | grep -qs stopped" % td.VBOX_NAME)[0] != 0:
+        while commands.getstatusoutput(
+                "prlctl list %s | grep -qs stopped" % td.VBOX_NAME)[0] != 0:
             time.sleep(2)
 
+
 def main():
-    # Initialize Testdrive Class, sending section used to retrieve settings from config file
+    # Initialize Testdrive Class,
+    # sending section used to retrieve settings from config file
     td = testdrive.Testdrive('testdrive')
 
     # Local UI
@@ -190,36 +220,48 @@
     Users wanting to change the behavior default configuration can make a\n\
     copy of /etc/%progrc, and pass this as a parameter to %prog.\n"
 
-
     parser = OptionParser(usage)
-    parser.add_option('-f', '--config', action='store', type='string', dest='config',
+    parser.add_option(
+        '-f', '--config', action='store', type='string', dest='config',
         help=_('user configuration file (overriding default values'))
-    parser.add_option('-v', '--version', action='store_true', dest='version', default=False,
+    parser.add_option(
+        '-v', '--version', action='store_true', dest='version', default=False,
         help=_('print version and system data, and exit'))
-    parser.add_option('-u', '--url', action='store', type='string', dest='url',
+    parser.add_option(
+        '-u', '--url', action='store', type='string', dest='url',
         help=_('get ISO image from this URL location'))
-    parser.add_option('-d', '--desktop', action='store_true', dest='desktop', default=False,
+    parser.add_option(
+        '-d', '--desktop', action='store_true', dest='desktop', default=False,
         help=_('try to launch usb-creator for further testing'))
-    parser.add_option('-r', '--release', action='store', type='string', dest='release',
+    parser.add_option(
+        '-r', '--release', action='store', type='string', dest='release',
         help=_('hardcode Ubuntu RELEASE codename'))
-    parser.add_option('-l', '--flavor', action='store', type='string', dest='flavor',
+    parser.add_option(
+        '-l', '--flavor', action='store', type='string', dest='flavor',
         help=_('hardcode Ubuntu flavor. Available Flavors:\n\
-             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/ubuntukylin'))
-    parser.add_option('-p', '--repo', action='store', type='string', dest='repository',
+             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/'
+             'ubuntustudio/lubuntu/ubuntukylin'))
+    parser.add_option(
+        '-p', '--repo', action='store', type='string', dest='repository',
         help=_('hardcode Ubuntu repository from where to obtain ISOs:\n\
              releases/cdimage/cloud-daily/cloud-releases'))
-    parser.add_option('-c', '--curses', action='store_true', default=False, dest='curses',
-        help=_('displays the Virtual Machine in the shell. Only valid for Cloud images.'))
-    #parser.add_option('-v', '--verbose', action='store_true', default=False, dest='verbose',
+    parser.add_option(
+        '-c', '--curses', action='store_true', default=False, dest='curses',
+        help=_('displays the Virtual Machine in the shell. '
+            'Only valid for Cloud images.'))
+    #parser.add_option(
+    #   '-v', '--verbose', action='store_true', default=False, dest='verbose',
     #   help=_('show debug messages'))
 
     (opt, args) = parser.parse_args()
     logger.info(_("version passed: %s") % opt.version)
     if opt.version:
         hasOptions = True
-        version = commands.getstatusoutput("dpkg -l testdrive-cli | tail -n1 | awk '{print $3}'")
+        version = commands.getstatusoutput(
+            "dpkg -l testdrive-cli | tail -n1 | awk '{print $3}'")
         logger.info(_("testdrive %s") % version[1])
-        #TODO: Why is get_virt() here? Disable until is determined if we really need it or not. If yes, we'll have to add same code as below,
+        #TODO: Why is get_virt() here? Disable until is determined if we really
+        # need it or not. If yes, we'll have to add same code as below,
         # for same function
         td.get_virt()
         sys.exit(0)
@@ -229,8 +271,9 @@
     ##############################
 
     # prime configuration with defaults
-    config_files = ["/etc/%s" % td.PKGRC, "%s/.%s" % (td.HOME, td.PKGRC), "%s/.config/%s/%s" % (td.HOME, td.PKG, td.PKGRC) ]
-    logger.info(_("config passed: %s") %opt.config)
+    config_files = ["/etc/%s" % td.PKGRC, "%s/.%s" % (td.HOME, td.PKGRC),
+                    "%s/.config/%s/%s" % (td.HOME, td.PKG, td.PKGRC)]
+    logger.info(_("config passed: %s") % opt.config)
     if opt.config:
         hasOptions = True
         if opt.config[0] != '/':
@@ -257,21 +300,23 @@
         error(_("Your CPU supports KVM acceleration; please install KVM:\n\
             sudo apt-get install qemu-kvm"))
     elif td.VIRT == 0:
-        error(_("Your CPU does not support acceleration; run kvm-ok for more information; then please install VirtualBox:\n\
+        error(_("Your CPU does not support acceleration; run kvm-ok for more "
+        "information; then please install VirtualBox:\n\
             kvm-ok\n\
             sudo apt-get install virtualbox"))
     elif td.VIRT == "kvm":
-        logger.info(_("Using KVM for virtual machine hosting..."));
+        logger.info(_("Using KVM for virtual machine hosting."))
     elif td.VIRT == "virtualbox":
-        logger.info(_("Using VirtualBox for virtual machine hosting..."))
+        logger.info(_("Using VirtualBox for virtual machine hosting."))
     elif td.VIRT == "paralels":
-        logger.info(_("Using Parallels Desktop for virtual machine hosting..."))
+        logger.info(_("Using Parallels Desktop for virtual machine hosting."))
 
     ##########################################
     ## UI Options needed after config files ##
     ##########################################
 
-    # TODO: is_iso function is locally used to see if the url is indeed one or not. Could be used by the front-end
+    # TODO: is_iso function is locally used to see if the url is indeed one
+    # or not. Could be used by the front-end
     # Process the rest of the options
     if opt.url:
         hasOptions = True
@@ -281,7 +326,8 @@
             td.ISO_URL = "file:///dev/null"
         elif is_cloud_img(opt.url):
             if td.VIRT != 'kvm':
-                error(_("Launching Cloud images only works with KVM. Please switch your virtualization method..."))
+                error(_("Launching Cloud images only works with KVM. Please "
+                "switch your virtualization method..."))
             td.p = 'cloud-daily'
             if opt.curses:
                 td.KVM_ARGS = td.KVM_ARGS + ' -curses'
@@ -297,7 +343,7 @@
     else:
         DESKTOP = 0
 
-    # Hardcoded release codename from executable. Overrides value in config file
+    # Hardcoded release codename from executable. Override value in config file
     if opt.release:
         hasOptions = True
         td.r = opt.release
@@ -323,20 +369,24 @@
     ## Obtain Release Codename from ISO cache      ##
     #################################################
 
-    # Verify if the ISO list is cached, if not, set variable to update/create it.
+    # Verify if the ISO list is cached, if not,
+    # set variable to update/create it
     if td.is_iso_list_cached() is False:
         update_cache = 1
-    # If ISO list is cached, verify if it is expired. If it is, set variable to update it.
+    # If ISO list is cached, verify if it is expired.
+    # If it is, set variable to update it.
     elif td.is_iso_list_cache_expired() is True:
         update_cache = 1
 
-    # If variable set to update, obtain the ISO list from the Ubuntu CD Image repository.
+    # If variable set to update, obtain the ISO list
+    # from the Ubuntu CD Image repository.
     if update_cache == 1:
         logger.info(_("Obtaining Ubuntu ISO list from %s...") % td.u)
         try:
             cdimage = td.obtain_ubuntu_iso_list_from_repo()
         except:
-            error(_("ERROR: Could not obtain the Ubuntu ISO list from %s...") % td.u)
+            error(_("ERROR: Could not obtain the Ubuntu ISO list from %s..."
+                    ) % td.u)
     # If the ISO List was obtained, update the cache fle
     if cdimage:
         try:
@@ -374,12 +424,14 @@
     if cmd == 1:
         error(_("Unsupported protocol [%s]") % td.PROTO)
     if td.PROTO != 'file' and td.PROTO != 'rsync':
-        if run("wget --spider -S %s 2>&1 | grep 'HTTP/1.. 200 OK'" % td.ISO_URL) != 0:
+        if run("wget --spider -S %s 2>&1 | grep 'HTTP/1.. 200 OK'"
+                % td.ISO_URL) != 0:
             error(_("ISO not found at [%s]") % td.ISO_URL)
     if cmd != 0:
         run_or_die(cmd)
     if td.p == 'cloud-daily' or td.p == 'cloud-releases':
-        logger.info("Preparing Cloud image [%s]" % os.path.basename(td.PATH_TO_ISO).split("_")[-1])
+        logger.info("Preparing Cloud image [%s]" % os.path.basename(
+            td.PATH_TO_ISO).split("_")[-1])
         td.prepare_cloud_img_tarball()
 
     ##########################
@@ -428,12 +480,15 @@
     logger.info(_("You may wish to clean up the cache directory..."))
     print(_("      %s and %s") % (td.CACHE_ISO, td.CACHE_IMG))
     #run("ls -HhalF %s %s" % (CACHE_ISO, CACHE_IMG))
-    #run("du -sh --apparent-size %s %s 2>/dev/null || du -sh %s %s" % (CACHE_ISO, CACHE_IMG))
+    #run("du -sh --apparent-size %s %s 2>/dev/null || \
+    #du -sh %s %s" % (CACHE_ISO, CACHE_IMG))
 
     # Launch Desktop
     if DESKTOP == 1:
-        if os.path.exists("/usr/bin/usb-creator-gtk") or os.path.exists("/usr/bin/usb-creator-kde"):
-            input = raw_input(_("\nLaunch USB Startup Disk Creator for further testing of this ISO? [y/N] "))
+        if os.path.exists("/usr/bin/usb-creator-gtk") or \
+                os.path.exists("/usr/bin/usb-creator-kde"):
+            input = raw_input(_("\nLaunch USB Startup Disk Creator for "
+            "further testing of this ISO? [y/N] "))
             if input == "y" or input == "Y":
                 td.launch_usb_creator()
         else:
 
=== modified file 'bin/testdrive-gtk'
--- bin/testdrive-gtk	2013-08-10 20:52:38 +0000
+++ bin/testdrive-gtk	2013-10-06 20:59:44 +0000
@@ -2,20 +2,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -25,28 +25,30 @@
 import time
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
 from testdrive import testdrive
 from testdrive.virt import kvm, parallels, virtualbox
-import threading, subprocess, commands
-import random
+import threading
+import subprocess
+import commands
+#import random
 import re
 
 gtk.gdk.threads_init()
 
 TAB_LABEL = []
-TAB_LABEL.append({"dist":"ubuntu", "label":"Ubuntu"})
-TAB_LABEL.append({"dist":"kubuntu", "label":"Kubuntu"})
-TAB_LABEL.append({"dist":"xubuntu", "label":"Xubuntu"})
-TAB_LABEL.append({"dist":"ubuntu-server", "label":"Server"})
-TAB_LABEL.append({"dist":"edubuntu", "label":"Edubuntu"})
-TAB_LABEL.append({"dist":"mythbuntu", "label":"Mythbuntu"})
-TAB_LABEL.append({"dist":"ubuntustudio", "label":"Ubuntu Studio"})
-TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})
-TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})
-TAB_LABEL.append({"dist":"other", "label":_("Other")})
+TAB_LABEL.append({"dist": "ubuntu", "label": "Ubuntu"})
+TAB_LABEL.append({"dist": "kubuntu", "label": "Kubuntu"})
+TAB_LABEL.append({"dist": "xubuntu", "label": "Xubuntu"})
+TAB_LABEL.append({"dist": "ubuntu-server", "label": "Server"})
+TAB_LABEL.append({"dist": "edubuntu", "label": "Edubuntu"})
+TAB_LABEL.append({"dist": "mythbuntu", "label": "Mythbuntu"})
+TAB_LABEL.append({"dist": "ubuntustudio", "label": "Ubuntu Studio"})
+TAB_LABEL.append({"dist": "lubuntu", "label": "Lubuntu"})
+TAB_LABEL.append({"dist": "ubuntukylin", "label": "UbuntuKylin"})
+TAB_LABEL.append({"dist": "other", "label": _("Other")})
 
 global ISOLIST
 
@@ -57,9 +59,9 @@
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
 if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'testdrivegtk'))
-    and PROJECT_ROOT_DIRECTORY not in sys.path):
+        and PROJECT_ROOT_DIRECTORY not in sys.path):
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
-    os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
+    os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY)  # for subprocesses
 
 try:
     import pynotify
@@ -70,7 +72,8 @@
     notifications_available = False
 
 from testdrivegtk import (
-    AboutTestdrivegtkDialog, PreferencesTestdrivegtkDialog, AddOtherTestdrivegtkDialog)
+    AboutTestdrivegtkDialog, PreferencesTestdrivegtkDialog,
+    AddOtherTestdrivegtkDialog)
 from testdrivegtk.helpers import get_builder
 
 try:
@@ -93,7 +96,7 @@
 class TestdrivegtkWindow(gtk.Window):
     __gtype_name__ = "TestdrivegtkWindow"
 
-    # To construct a new instance of this method, the following notable 
+    # To construct a new instance of this method, the following notable
     # methods are called in this order:
     # __new__(cls)
     # __init__(self)
@@ -104,7 +107,7 @@
     # your inialization code in finish_intializing
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
 
         Returns a fully instantiated TestdrivegtkWindow object.
@@ -166,8 +169,10 @@
             self.application_indicator_menu()
 
     def application_indicator_menu(self):
-        self.appindicator = appindicator.Indicator ("testdrive", "indicator-messages", appindicator.CATEGORY_APPLICATION_STATUS)
-        self.appindicator.set_status (appindicator.STATUS_PASSIVE)
+        self.appindicator = appindicator.Indicator(
+            "testdrive", "indicator-messages",
+            appindicator.CATEGORY_APPLICATION_STATUS)
+        self.appindicator.set_status(appindicator.STATUS_PASSIVE)
         #self.appindicator.set_icon("testdrive-indicator")
         self.appindicator.set_icon("testdrive-attention")
         #self.appindicator.set_attention_icon("distributor-logo")
@@ -175,7 +180,8 @@
         # create a menu
         self.app_indicator_menu = gtk.Menu()
 
-        # create items for the menu - labels, checkboxes, radio buttons and images are supported:
+        # create items for the menu - labels, checkboxes,
+        # radio buttons and images are supported:
         item = gtk.MenuItem("Pre-release available for testing!")
         item.connect("activate", self.on_indicator_message_clicked, item)
         item.show()
@@ -189,8 +195,10 @@
         self.app_indicator_menu.show()
         self.appindicator.set_menu(self.app_indicator_menu)
 
-        gobject.timeout_add_seconds(self.timea, self.on_check_qa_releases_available, self.timea)
-        gobject.timeout_add_seconds(self.timeb, self.on_check_qa_releases_available, self.timeb)
+        gobject.timeout_add_seconds(
+            self.timea, self.on_check_qa_releases_available, self.timea)
+        gobject.timeout_add_seconds(
+            self.timeb, self.on_check_qa_releases_available, self.timeb)
 
     # Initializes the indicator
     def messaging_indicator_menu(self):
@@ -204,25 +212,34 @@
 
         # Initializes the Indicator
         self.indicator = indicate.Indicator()
-        self.indicator.set_property("name", "Pre-release available for testing!")
+        self.indicator.set_property(
+            "name", "Pre-release available for testing!")
         self.indicator.set_property_time("time", time.time())
         #indicator.show()
 
-        self.indicator.connect("user-display", self.on_indicator_message_clicked)
+        self.indicator.connect(
+            "user-display", self.on_indicator_message_clicked)
 
         # Checks every 3600 seconds - hour - (If TestDrive is open that long)
-        gobject.timeout_add_seconds(self.timea, self.on_check_qa_releases_available, self.timea)
-        gobject.timeout_add_seconds(self.timeb, self.on_check_qa_releases_available, self.timeb)
+        gobject.timeout_add_seconds(
+            self.timea, self.on_check_qa_releases_available, self.timea)
+        gobject.timeout_add_seconds(
+            self.timeb, self.on_check_qa_releases_available, self.timeb)
 
-    # Checks for the availability of ISOs at iso.qa.ubuntu.com and displays notification if so.
+    # Checks for the availability of ISOs at iso.qa.ubuntu.com
+    # and displays notification if so.
     def on_check_qa_releases_available(self, time):
         output = ""
         if self.notified is True:
             return False
-        logging.info(_("Checking available ISOs at the ISO tracker [http://iso.qa.ubuntu.com] every %s seconds") % time)
+        logging.info(_("Checking available ISOs at the ISO tracker "
+                       "[http://iso.qa.ubuntu.com] every %s seconds") % time)
         try:
-            #(status, output) = commands.getstatusoutput("wget -q -O- http://iso.qa.ubuntu.com/qatracker/dllist")
-            (status, output) = commands.getstatusoutput("wget -q -O- http://iso.qa.ubuntu.com/qatracker | egrep 'iso.qa.ubuntu.com/qatracker/test'")
+            #(status, output) = commands.getstatusoutput(
+            #   "wget -q -O- http://iso.qa.ubuntu.com/qatracker/dllist")
+            (status, output) = commands.getstatusoutput(
+                "wget -q -O- http://iso.qa.ubuntu.com/qatracker | egrep "
+                "'iso.qa.ubuntu.com/qatracker/test'")
         except:
             logging.error(_("Unable to check the ISO tracker"))
 
@@ -231,7 +248,9 @@
             global notifications_available
             if notifications_available:
                 # Notification
-                self.notification = pynotify.Notification("TestDrive an Ubuntu ISO!", "Pre-release available for testing!", imageURI)
+                self.notification = pynotify.Notification(
+                    "TestDrive an Ubuntu ISO!",
+                    "Pre-release available for testing!", imageURI)
                 self.notification.show()
             global message_indicator
             if message_indicator:
@@ -248,7 +267,8 @@
 
         return True
 
-    # Click event for Indicator: Opens website when the notification is being clicked.
+    # Click event for Indicator:
+    # Opens website when the notification is being clicked.
     def on_indicator_message_clicked(self, indicator, timestamp):
         webbrowser.open("http://iso.qa.ubuntu.com/")
         if message_indicator:
@@ -287,8 +307,10 @@
 
             # Obtain preferences
             td = prefs.get_preferences()
-            # If Repo (p), Release, Arch (m), Flavor, or ISO CACHE are different, then, regenerate the UI
-            if self.td.p != td.p or self.td.r != td.r or self.td.m != td.m or self.td.f != td.f or self.td.CACHE_ISO != td.CACHE_ISO:
+            # If Repo (p), Release, Arch (m), Flavor, or ISO CACHE are
+            # different, then, regenerate the UI
+            if self.td.p != td.p or self.td.r != td.r or self.td.m != td.m or \
+                    self.td.f != td.f or self.td.CACHE_ISO != td.CACHE_ISO:
                 ui_recreate = True
             # Update preferences
             self.td = td
@@ -302,7 +324,8 @@
 
     def new_other_iso(self, widget, data=None):
         """Display Add Other ISO dialog"""
-        other = AddOtherTestdrivegtkDialog.AddOtherTestdrivegtkDialog(self.td.CACHE)
+        other = AddOtherTestdrivegtkDialog.AddOtherTestdrivegtkDialog(
+            self.td.CACHE)
         other.set_title(_("Add an ISO to TestDrive"))
         response = other.run()
         if response == gtk.RESPONSE_OK:
@@ -319,9 +342,10 @@
         ###################################################################
 
         if commands.getstatusoutput("which testdrive")[0] != 0:
-            self.on_error_dialog( _("Unable to open because 'testdrive' is not installed.\n"
-                        "Please install testdrive: \n\n"
-                        "sudo apt-get install testdrive-cli"))
+            self.on_error_dialog(_("Unable to open because 'testdrive' "
+                                   "is not installed.\n"
+                                   "Please install testdrive: \n\n"
+                                   "sudo apt-get install testdrive-cli"))
             return
         title = _("TestDrive an ISO or Disk Image")
         filename = None
@@ -329,15 +353,19 @@
         testdrives.add_pattern("*.iso")
         testdrives.add_pattern("*.img")
 
-        chooser = gtk.FileChooserDialog(title,action=gtk.FILE_CHOOSER_ACTION_SAVE,
-        buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
+        chooser = gtk.FileChooserDialog(
+            title, action=gtk.FILE_CHOOSER_ACTION_SAVE,
+            buttons=(
+                gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                gtk.STOCK_OPEN, gtk.RESPONSE_OK))
         chooser.add_filter(testdrives)
         # Run Chooser Dialog
         response = chooser.run()
 
         if response == gtk.RESPONSE_OK:
             filename = chooser.get_filename()
-            subprocess.Popen(['testdrive', '-u', filename], stdout=subprocess.PIPE)
+            subprocess.Popen([
+                'testdrive', '-u', filename], stdout=subprocess.PIPE)
             pass
         chooser.destroy()
 
@@ -350,31 +378,31 @@
         # Clean up code for saving application state should be added here.
         # Stop all the syncs and launched ISOs
         for t in self.isos_to_run:
-            if t[0] != None:
+            if t[0] is not None:
                 t[0].stop()
-            if t[1] != None:
+            if t[1] is not None:
                 t[1].stop()
         # Class function to cleanup the IMG Cache
         self.cleanup_img_cache()
         gtk.main_quit()
 
     def on_warn_dialog(self, data=None):
-        warnbox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_WARNING, 
+        warnbox = gtk.MessageDialog(
+            self, gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_WARNING,
             gtk.BUTTONS_CLOSE, data)
         warnbox.run()
         warnbox.destroy()
 
     def on_error_dialog(self, data=None):
-        errorbox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, 
+        errorbox = gtk.MessageDialog(
+            self, gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR,
             gtk.BUTTONS_CLOSE, data)
         errorbox.run()
         errorbox.destroy()
 
     def on_info_dialog(self, data=None):
-        infobox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO, 
+        infobox = gtk.MessageDialog(
+            self, gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO,
             gtk.BUTTONS_CLOSE, data)
         infobox.run()
         infobox.destroy()
@@ -387,7 +415,8 @@
         imagelist = os.listdir(self.td.CACHE_IMG)
         for disk in imagelist:
             path = "%s/%s" % (self.td.CACHE_IMG, disk)
-            (status, output) = commands.getstatusoutput("file %s | grep -qs 'empty'" % path)
+            (status, output) = commands.getstatusoutput(
+                "file %s | grep -qs 'empty'" % path)
             if status == 0:
                 os.unlink(path)
         for disk in self.isos_to_run:
@@ -401,7 +430,8 @@
         logging.info(_("Obtaining the sync protocol for the specified ISO..."))
         cmd = self.td.get_proto()
         if cmd == 1:
-            self.on_error_dialog(_("Unsupported protocol [%s]") % self.td.PROTO)
+            self.on_error_dialog(_(
+                "Unsupported protocol [%s]") % self.td.PROTO)
         if cmd != 0:
             return cmd
         return False
@@ -416,18 +446,22 @@
         if not self.td.VIRT:
             self.td.VIRT = self.td.get_virt()
         if self.td.VIRT == 1:
-            logging.error(_("Your CPU supports KVM acceleration; please install KVM"))
-            self.on_warn_dialog(  _("Your CPU supports KVM acceleration; please install KVM:"
-                        "\n\n"
-                        "sudo apt-get install qemu-kvm"))
+            logging.error(_("Your CPU supports KVM acceleration; "
+                            "please install KVM"))
+            self.on_warn_dialog(_("Your CPU supports KVM acceleration; "
+                                  "please install KVM:"
+                                  "\n\n"
+                                  "sudo apt-get install qemu-kvm"))
         if self.td.VIRT == 0:
-            logging.error(_("Your CPU does not support acceleration; run kvm-ok for more information; then install VBox"))
-            self.on_warn_dialog(  _("Your CPU does not support acceleration; run kvm-ok for more information;\n"
-                        "then please install VirtualBox"
-                        "\n\n"
-                        "kvm-ok"
-                        "\n"
-                        "sudo apt-get install virtualbox"))
+            logging.error(_("Your CPU does not support acceleration; "
+                          "run kvm-ok for more information; then install VBox"))
+            self.on_warn_dialog(_("Your CPU does not support acceleration; "
+                                  "run kvm-ok for more information;\n"
+                                  "then please install VirtualBox"
+                                  "\n\n"
+                                  "kvm-ok"
+                                  "\n"
+                                  "sudo apt-get install virtualbox"))
 
     def obtain_isos_list(self):
         ###################################################################
@@ -439,8 +473,10 @@
         try:
             isos = self.td.get_ubuntu_iso_list()
         except:
-            logging.error(_("Unable to retrieve the Ubuntu ISO list from cache..."))
-            self.on_error_dialog(_("Unable to retrieve the Ubuntu ISO list from cache..."))
+            logging.error(_(
+                "Unable to retrieve the Ubuntu ISO list from cache..."))
+            self.on_error_dialog(_(
+                "Unable to retrieve the Ubuntu ISO list from cache..."))
             return []
         return isos
 
@@ -461,12 +497,14 @@
         # Processing ISOS from file into ISO list
         for iso in ISOS:
             category = iso.split()[0]
-            distro = iso.split()[1] #This will be the distro showed instead of arch
+            #This will be the distro showed instead of arch
+            distro = iso.split()[1]
             url = iso.split()[2]
             if url.partition("://")[0] == "wget":
                                         url = url.replace('wget', 'http')
             name = iso.split()[3]
-            ISO.append({"name":name, "url":url, "arch":distro, "category":category})
+            ISO.append({"name": name, "url": url,
+                       "arch": distro, "category": category})
         return ISO
 
     def on_distro_tab_change(self, widget, none=None, current_page=None):
@@ -491,7 +529,7 @@
         self.create_iso_menu(ISO)
         self.update_status_bar()
 
-    def create_iso_menu(self, iso_list = None):
+    def create_iso_menu(self, iso_list=None):
         ###################################################################
         ############ Creates all the Distro Tabs and the ISO's ############
         ###################################################################
@@ -542,7 +580,7 @@
             vbox = gtk.VBox()
             scroll.add_with_viewport(vbox)
             scroll.get_children()[0].set_shadow_type(gtk.SHADOW_NONE)
-            scroll.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC)
+            scroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
             scroll.show()
             for arch in self.td.m:
                 c = 0
@@ -555,30 +593,45 @@
                     if iso['category'] == dist and iso['arch'] == arch:
                         c = c + 1
                         table = gtk.Table(2, 3, False)
-                        lb_iso_name = gtk.CheckButton("%s - (%s)" % (iso["name"], self.td.r))
+                        lb_iso_name = gtk.CheckButton("%s - (%s)" % (
+                            iso["name"], self.td.r))
                         lb_iso_name.show()
                         filename = os.path.basename(iso["url"])
-                        path = "%s/%s_%s" % (self.td.CACHE_ISO, iso["category"], filename)
+                        path = "%s/%s_%s" % (self.td.CACHE_ISO,
+                                             iso["category"], filename)
                         if os.path.exists(path):
-                            lb_cache = gtk.Label(_("<i>     CACHE: [%s]</i>") % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(os.path.getmtime(path)))))
+                            lb_cache = gtk.Label(_(
+                                "<i>     CACHE: [%s]</i>") % (time.strftime(
+                                "%Y-%m-%d %H:%M:%S", time.localtime(
+                                    os.path.getmtime(path)))))
                         else:
-                            lb_cache = gtk.Label(_("<i>     CACHE: [empty]</i>"))
+                            lb_cache = gtk.Label(_(
+                                "<i>     CACHE: [empty]</i>"))
                         lb_cache.set_use_markup(True)
                         # To align to righ otherwise it is centered
-                        lb_cache.set_alignment(0,0)
+                        lb_cache.set_alignment(0, 0)
                         lb_cache.show()
                         # Adding the Spiiner
                         spin = gtk.Spinner()
-                        spin.set_size_request(18, -1);
+                        spin.set_size_request(18, -1)
                         spin.hide()
-                        #lb_iso_name.connect("clicked", self.on_select_iso_clicked, spin, lb_cache, iso["url"], iso["category"], vm_id)
-                        lb_iso_name.connect("clicked", self.on_select_iso_clicked, vm_id)
-                        ISOLIST.append({"vm_id":vm_id, "url":iso["url"], "prefix":iso["category"], "spinner":spin, "lb_status":lb_cache})
+                        #lb_iso_name.connect(
+                        #    "clicked", self.on_select_iso_clicked, spin,
+                        #    lb_cache, iso["url"], iso["category"], vm_id)
+                        lb_iso_name.connect(
+                            "clicked", self.on_select_iso_clicked, vm_id)
+                        ISOLIST.append({"vm_id": vm_id, "url": iso["url"],
+                                        "prefix": iso["category"], "spinner":
+                                        spin, "lb_status": lb_cache})
                         vm_id += 1
-                        table.attach(lb_iso_name, 0, 3, 0, 1, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND)
-                        table.attach(spin, 0, 1, 1, 2, gtk.FILL, gtk.FILL | gtk.EXPAND)
-                        table.attach(lb_cache, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND, 0, 5)
-                        #table.attach(lb_progress, 2, 3, 1, 2, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND)
+                        table.attach(lb_iso_name, 0, 3, 0, 1, gtk.FILL |
+                                     gtk.EXPAND, gtk.FILL | gtk.EXPAND)
+                        table.attach(spin, 0, 1, 1, 2, gtk.FILL,
+                                     gtk.FILL | gtk.EXPAND)
+                        table.attach(lb_cache, 1, 2, 1, 2, gtk.FILL |
+                                     gtk.EXPAND, gtk.FILL | gtk.EXPAND, 0, 5)
+                        #table.attach(lb_progress, 2, 3, 1, 2, gtk.FILL |
+                        # gtk.EXPAND, gtk.FILL | gtk.EXPAND)
                         table.show()
                         viewport = gtk.Viewport()
                         viewport.add(table)
@@ -593,27 +646,42 @@
                         lb_iso_name = gtk.CheckButton("%s" % iso["name"])
                         lb_iso_name.show()
                         filename = os.path.basename(iso["url"])
-                        path = "%s/%s_%s" % (self.td.CACHE_ISO, iso["category"], filename)
+                        path = "%s/%s_%s" % (self.td.CACHE_ISO,
+                                             iso["category"], filename)
                         if os.path.exists(path):
-                            lb_cache = gtk.Label(_("<i>     CACHE: [%s]</i>") % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(os.path.getmtime(path)))))
+                            lb_cache = gtk.Label(_("<i>     CACHE: [%s]</i>")
+                                                 % (time.strftime("%Y-%m-%d %H"
+                                                 ":%M:%S", time.localtime(
+                                                 os.path.getmtime(path)))))
                         else:
-                            lb_cache = gtk.Label(_("<i>     CACHE: [empty]</i>"))
+                            lb_cache = gtk.Label(_(
+                                "<i>     CACHE: [empty]</i>"))
                         lb_cache.set_use_markup(True)
-                        # To align to righ otherwise it is centered
-                        lb_cache.set_alignment(0,0)
+                        # To align to right otherwise it is centered
+                        lb_cache.set_alignment(0, 0)
                         lb_cache.show()
                         # Adding the Spiiner
                         spin = gtk.Spinner()
-                        spin.set_size_request(18, -1);
+                        spin.set_size_request(18, -1)
                         spin.hide()
-                        #lb_iso_name.connect("clicked", self.on_select_iso_clicked, spin, lb_cache, iso["url"], iso["category"], vm_id)
-                        lb_iso_name.connect("clicked", self.on_select_iso_clicked, vm_id)
-                        ISOLIST.append({"vm_id":vm_id, "url":iso["url"], "prefix":iso["category"], "spinner":spin, "lb_status":lb_cache})
+                        #lb_iso_name.connect("clicked",
+                        #                    self.on_select_iso_clicked, spin,
+                        #                    lb_cache, iso["url"],
+                        #                    iso["category"], vm_id)
+                        lb_iso_name.connect("clicked",
+                                            self.on_select_iso_clicked, vm_id)
+                        ISOLIST.append({"vm_id": vm_id, "url": iso["url"],
+                                        "prefix": iso["category"], "spinner":
+                                        spin, "lb_status": lb_cache})
                         vm_id += 1
-                        table.attach(lb_iso_name, 0, 3, 0, 1, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND)
-                        table.attach(spin, 0, 1, 1, 2, gtk.FILL, gtk.FILL | gtk.EXPAND)
-                        table.attach(lb_cache, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND, 0, 5)
-                        #table.attach(lb_progress, 2, 3, 1, 2, gtk.FILL | gtk.EXPAND, gtk.FILL | gtk.EXPAND)
+                        table.attach(lb_iso_name, 0, 3, 0, 1, gtk.FILL |
+                                     gtk.EXPAND, gtk.FILL | gtk.EXPAND)
+                        table.attach(spin, 0, 1, 1, 2, gtk.FILL,
+                                     gtk.FILL | gtk.EXPAND)
+                        table.attach(lb_cache, 1, 2, 1, 2, gtk.FILL |
+                                     gtk.EXPAND, gtk.FILL | gtk.EXPAND, 0, 5)
+                        #table.attach(lb_progress, 2, 3, 1, 2, gtk.FILL |
+                        #   gtk.EXPAND, gtk.FILL | gtk.EXPAND)
                         table.show()
                         viewport = gtk.Viewport()
                         viewport.add(table)
@@ -625,10 +693,12 @@
                 if c == 0:
                     if dist == 'other':
                         no_isos_label = gtk.Label()
-                        no_isos_label.set_markup(_("<b><i>There are no Other ISOs yet...</i></b>"))
+                        no_isos_label.set_markup(_("<b><i>There are no Other "
+                        "ISOs yet...</i></b>"))
                     else:
                         no_isos_label = gtk.Label()
-                        no_isos_label.set_markup(_("<b><i>There are no ISOs for this architecture yet...</i></b>"))
+                        no_isos_label.set_markup(_("<b><i>There are no ISOs "
+                        "for this architecture yet...</i></b>"))
                     no_isos_label.show()
                     vbox2.add(no_isos_label)
 
@@ -637,7 +707,8 @@
                 if dist != 'other':
                     fr_arch.add(vbox2)
                     fr_arch.show()
-                    vbox.pack_start(fr_arch, expand=False, fill=False, padding=0)
+                    vbox.pack_start(
+                        fr_arch, expand=False, fill=False, padding=0)
                     vbox.show()
                 else:
                     vbox.pack_start(vbox2, expand=False, fill=False, padding=0)
@@ -647,7 +718,8 @@
             # Create Tabs
             for lb_iso_name in TAB_LABEL:
                 if dist == lb_iso_name["dist"]:
-                    self.notebook.append_page(scroll, gtk.Label(lb_iso_name["label"]))
+                    self.notebook.append_page(
+                        scroll, gtk.Label(lb_iso_name["label"]))
                     break
         self.notebook.show()
 
@@ -670,7 +742,8 @@
 
         # Create Buttons
         button = gtk.Button(_("Create USB Disk"))
-        button.connect("clicked", self.on_create_iso_disk_clicked, 'Create Disk')
+        button.connect(
+            "clicked", self.on_create_iso_disk_clicked, 'Create Disk')
         button.show()
         bbox.pack_start(button)
 
@@ -687,9 +760,12 @@
 
         vbox.pack_start(bbox, True, True)
 
-    #def on_select_iso_clicked(self, widget, spin, status_label, url=None, iso_path_header=None, vm_id=None):
-    #ISOLIST.append({"vm_id":vm_id, "url":iso["url"], "prefix":iso["category"], "spin":spin, "lb_status":lb_cache})
-    #lb_iso_name.connect("clicked", self.on_select_iso_clicked, spin, lb_cache, iso["url"], iso["category"], vm_id)
+    #def on_select_iso_clicked(self, widget, spin, status_label,
+    #url=None, iso_path_header=None, vm_id=None):
+    #ISOLIST.append({"vm_id":vm_id, "url":iso["url"],
+    #"prefix":iso["category"], "spin":spin, "lb_status":lb_cache})
+    #lb_iso_name.connect("clicked", self.on_select_iso_clicked,
+    # spin, lb_cache, iso["url"], iso["category"], vm_id)
     def on_select_iso_clicked(self, widget, vm_id):
         ###################################################################
         # When ISO is clicked, does the setup to be ready to launch/sync ##
@@ -704,7 +780,7 @@
         #ISOLIST[vm_id]["sync_cmd"]  # Sync command used
         #ISOLIST[vm_id]["vbox_name"] # Name for VBOX/Parallels
         #ISOLIST[vm_id]["virt"]      # Holds the Virt Object
-        #ISOLIST[vm_id]["virt_type"] # Defines the type of virt (kvm, vbox, parallels)
+        #ISOLIST[vm_id]["virt_type"] # Defines kvm, vbox, or parallels
 
         launch_cmd = None
         sync_cmd = None
@@ -716,14 +792,15 @@
         self.td.set_launch_path()
 
         ISOLIST[vm_id]["path_to_iso"] = self.td.PATH_TO_ISO
-        # TODO - This is a workaround to issue of zsync command. See testdrive.py 'cd '%s' && zsync etc etc'
+        # TODO - This is a workaround to issue of zsync command.
+        # See testdrive.py 'cd '%s' && zsync etc etc'
         cmd = self.obtain_sync_protocol_cmd()
         if self.td.PROTO == "zsync":
             ISOLIST[vm_id]["sync_cmd"] = cmd.split("&&")[1].strip()
         else:
             ISOLIST[vm_id]["sync_cmd"] = cmd
 
-        if widget.get_active() == True:
+        if widget.get_active() is True:
             self.td.DISK_FILE = self.td.create_disk_file()
             self.td.VBOX_NAME = "%s-%s" % (self.td.PKG, vm_id)
             ISOLIST[vm_id]["vbox_name"] = self.td.VBOX_NAME
@@ -733,13 +810,16 @@
 
             # Selecting virt method and Instancing VIRT object
             if self.td.VIRT == "kvm":
-                logging.info(_("Using KVM for virtual machine hosting..."))
+                logging.info(_(
+                    "Using KVM for virtual machine hosting..."))
                 virt = kvm.KVM(self.td)
             if self.td.VIRT == "virtualbox":
-                logging.info(_("Using VirtualBox for virtual machine hosting..."))
+                logging.info(_(
+                    "Using VirtualBox for virtual machine hosting..."))
                 virt = virtualbox.VBox(self.td)
             if self.td.VIRT == "paralels":
-                logging.info(_("Using Parallels Desktop for virtual machine hosting..."))
+                logging.info(_(
+                    "Using Parallels Desktop for virtual machine hosting..."))
                 virt = parallels.Parallels(self.td)
 
             # Passing VIRT object to ISOLIST
@@ -749,9 +829,10 @@
             # Instancing Launch Thread
             launch_thread = LaunchThread(vm_id)
 
-            self.isos_to_run.append([sync_thread, launch_thread, self.td.DISK_FILE, status])
+            self.isos_to_run.append([
+                sync_thread, launch_thread, self.td.DISK_FILE, status])
 
-        if widget.get_active() == False:
+        if not widget.get_active():
             for t in self.isos_to_run:
                 if t[0].command == ISOLIST[vm_id]["sync_cmd"]:
                     t[0].stop()
@@ -760,8 +841,8 @@
                     self.td.delete_image()
                     self.isos_to_run.remove(t)
 
-                ###############################################################################
-        # TODO - TODO - TODO - Determine better method to stop des-selected ISO's
+        #######################################################################
+        # TODO - Determine better method to stop des-selected ISO's
         """
         if widget.get_active() == False:
             for t in self.isos_to_run:
@@ -814,40 +895,44 @@
                 except:
                     pass
             else:
-                logging.debug(_("launch_iso: Thread is executing or syncing..."))
+                logging.debug(_(
+                    "launch_iso: Thread is executing or syncing..."))
 
     def on_create_iso_disk_clicked(self, widget, data=None):
         ###################################################################
         ############ Launches USB Creator for the selected ISO ############
         ###################################################################
         if not self.isos_to_run:
-            self.on_error_dialog( _("No ISO has been selected."
-                        "\n\n"
-                        "Please select an ISO to create an USB Startup Disk."))
+            self.on_error_dialog(_("No ISO has been selected."
+                                   "\n\n"
+                                   "Please select an ISO to create an "
+                                   "USB Startup Disk."))
             return
         if len(self.isos_to_run) > 1:
-            self.on_error_dialog( _("More than 1 ISO has been selected."
-                        "\n\n"
-                        "Please select only 1 ISO to continue!"))
+            self.on_error_dialog(_("More than 1 ISO has been selected."
+                                   "\n\n"
+                                   "Please select only 1 ISO to continue!"))
             return
         if not os.path.exists(self.td.PATH_TO_ISO):
-            self.on_error_dialog( _("The specified ISO does not exist!"
-                        "\n\n"
-                        "Please, synchronize the ISO to continue."))
+            self.on_error_dialog(_("The specified ISO does not exist!"
+                                   "\n\n"
+                                   "Please synchronize the ISO to continue."))
             return
         try:
-            self.p = subprocess.Popen(["usb-creator-gtk", "-i", self.td.PATH_TO_ISO])
+            self.p = subprocess.Popen(["usb-creator-gtk", "-i",
+                                       self.td.PATH_TO_ISO])
         except:
             self.on_error_dialog(_("Unable to launch USB Creator!"))
             return
 
+
 ###################################################################
 ########## Class that support threading for ISO Syncing ###########
 ###################################################################
 class SyncThread(threading.Thread):
     #def __init__(self, label, spinner, progress, cmd, url):
     def __init__(self, vm_id):
-        threading.Thread.__init__ (self)
+        threading.Thread.__init__(self)
         self.spin = ISOLIST[vm_id]["spinner"]
         self.status_label = ISOLIST[vm_id]["lb_status"]
         self.previous_text = self.status_label.get_text()
@@ -859,16 +944,19 @@
 
     def run(self):
         cmd = self.command.split()
-        self.p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines = True)
+        self.p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                                  universal_newlines=True)
         percent = re.compile(r'(\d+)%')
         self.status_label.show()
         self.spin.show()
         self.spin.start()
-        text = _(" Downloading %s (0%%)") % os.path.basename(self.url).partition("_")[2]
-        self.status_label.set_markup("<b><span size='10000'>%s</span></b>" % text)
+        text = _(" Downloading %s (0%%)") % os.path.basename(
+            self.url).partition("_")[2]
+        self.status_label.set_markup(
+            "<b><span size='10000'>%s</span></b>" % text)
         prev = None
         while not self.stopthread.isSet():
-            if self.p.poll() != None:
+            if self.p.poll() is not None:
                 self.update_status_label()
                 self.p = None
                 self.spin.stop()
@@ -880,12 +968,14 @@
             #gtk.gdk.threads_leave()
             line = self.p.stdout.readline(1024).strip()
             match = percent.search(line)
-            if match != None:
+            if match is not None:
                 cur = match.group(1)
                 if prev != cur:
                     prev = match.group(1)
-                    text = _(" Downloading %s (%s%%)") % (os.path.basename(self.url).partition("_")[2], prev)
-                    self.status_label.set_markup("<b><span size='10000'>%s</span></b>" % text)
+                    text = _(" Downloading %s (%s%%)") % (os.path.basename(
+                        self.url).partition("_")[2], prev)
+                    self.status_label.set_markup(
+                        "<b><span size='10000'>%s</span></b>" % text)
             time.sleep(1)
 
     def stop(self):
@@ -902,10 +992,13 @@
 
     def update_status_label(self):
         if os.path.exists(self.url):
-            self.status_label.set_markup(_("<i>     CACHE: [%s]</i>") % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(os.path.getmtime(self.url)))))
+            self.status_label.set_markup(_("<i>     CACHE: [%s]</i>") % (
+                time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(
+                    os.path.getmtime(self.url)))))
         else:
             self.status_label.set_markup(_("<i>     CACHE: [empty]</i>"))
 
+
 ###################################################################
 ########## Class that supports threading for VM Running ###########
 ###################################################################
@@ -923,9 +1016,9 @@
         self.p = None
 
     def prepare_to_launch_vm(self):
-                ###################################################################
-                ######## Prepare the VM to launch and return launch command #######
-                ###################################################################
+                ###############################################################
+                ##### Prepare the VM to launch and return launch command ######
+                ###############################################################
         # TODO TODO TODO - Re-add validation
         self.ovirt.validate_virt()
         self.ovirt.setup_virt()
@@ -945,8 +1038,9 @@
 
         if self.virt == 'kvm':
             while not self.stopthread.isSet():
-                if self.p.poll() != None:
-                    self.status_label.set_markup("<i>%s</i>" % self.previous_text)
+                if self.p.poll() is not None:
+                    self.status_label.set_markup(
+                        "<i>%s</i>" % self.previous_text)
                     self.p = None
                     break
                 time.sleep(0.1)
@@ -954,16 +1048,20 @@
         elif self.virt == 'virtualbox':
             time.sleep(5)
             while not self.stopthread.isSet():
-                if commands.getstatusoutput("VBoxManage list runningvms | grep -qs %s" % self.VBOX_NAME)[0] != 0:
-                    self.status_label.set_markup("<i>%s</i>" % self.previous_text)
+                if commands.getstatusoutput("VBoxManage list runningvms | "
+                "grep -qs %s" % self.VBOX_NAME)[0] != 0:
+                    self.status_label.set_markup("<i>%s</i>"
+                                                 % self.previous_text)
                     self.p = None
                     break
                 time.sleep(2)
 
         elif self.virt == 'parallels':
             while not self.stopthread.isSet():
-                if commands.getstatusoutput("prlctl list %s | grep -qs stopped" % td.VBOX_NAME)[0] == 0:
-                    self.status_label.set_markup("<i>%s</i>" % self.previous_text)
+                if commands.getstatusoutput("prlctl list %s | grep -qs stopped"
+                                            % td.VBOX_NAME)[0] == 0:
+                    self.status_label.set_markup(
+                        "<i>%s</i>" % self.previous_text)
                     self.p = None
                     break
                 time.sleep(2)
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-28 02:34:10 +0000
+++ debian/changelog	2013-10-06 20:59:44 +0000
@@ -2,15 +2,13 @@
 
   * Fixed VirtualBox PAE option bug. LP: #940755
     Thanks Ben Blankley
+  * Follow pep8 standards
+  * debian/copyright: Add testdrivegtk/AddOtherTestdrivegtkDialog.py
+  * debian/control: Add working VCS fields
+  * debian/release.sh: Update current ubuntu release
 
  -- Jackson Doak <[e-mail]>  Sat, 28 Sep 2013 12:30:24 +1000
 
-testdrive (3.25) unreleased; urgency=low
-
-  * UNRELEASED
-
- -- Dustin Kirkland <[e-mail]>  Tue, 27 Aug 2013 11:31:59 -0500
-
 testdrive (3.24-0ubuntu1) saucy; urgency=low
 
   [ Jackson Doak ]
 
=== modified file 'debian/control'
--- debian/control	2013-08-27 16:23:53 +0000
+++ debian/control	2013-10-06 20:59:44 +0000
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 9), gettext-base, python (>= 2.6.6-3~), python-distutils-extra (>= 2.10)
 X-Python-Version: >= 2.6
 Homepage: http://launchpad.net/testdrive
-Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/testdrive/trunk
+Vcs-Bzr: bzr://bazaar.launchpad.net/+branch/testdrive/
+Vcr-Browser: https://code.launchpad.net/~testdrive/testdrive/trunk
 
 Package: testdrive
 Architecture: all
 
=== modified file 'debian/copyright'
--- debian/copyright	2013-08-13 06:10:36 +0000
+++ debian/copyright	2013-10-06 20:59:44 +0000
@@ -22,3 +22,8 @@
  .
  On Debian systems, the complete text of the GNU General Public
  License, version 3, can be found in /usr/share/common-licenses/GPL-3.
+
+Files: testdrivegtk/AddOtherTestdrivegtkDialog.py
+Copyright: Public domain
+License: Public domain
+ This file is in the public domain
 
=== modified file 'debian/release.sh'
--- debian/release.sh	2009-11-12 23:26:08 +0000
+++ debian/release.sh	2013-10-06 20:59:44 +0000
@@ -8,7 +8,7 @@
 	exit 1
 }
 
-head -n1 debian/changelog | grep "lucid" || error "This version must be ready for 'lucid'"
+head -n1 debian/changelog | grep "saucy" || error "This version must be ready for 'saucy'"
 
 # Tag the release in bzr
 minor=`head -n1 debian/changelog | sed "s/^.*($MAJOR.//" | sed "s/-.*$//"`
 
=== modified file 'po/testdrive.pot'
--- po/testdrive.pot	2013-08-10 21:31:38 +0000
+++ po/testdrive.pot	2013-10-06 20:59:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-11 07:31+1000\n"
+"POT-Creation-Date: 2013-10-06 19:12+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -29,62 +29,63 @@
 msgid "ISO;Testing;Ubuntu;Daily;VM;Virtual Machine;zsync;rsync;Testdrive"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:49
+#: ../bin/testdrive-gtk.py:51
 msgid "Other"
 msgstr ""
 
 #. ##################################################################
 #. ####### Obtaining the settings from the Preferences Class ########
 #. ##################################################################
-#: ../bin/testdrive-gtk.py:139
+#: ../bin/testdrive-gtk.py:142
 msgid "Instancing Preferences..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:222
+#: ../bin/testdrive-gtk.py:235
 #, python-format
 msgid ""
-"Checking available ISOs at the ISO tracker [http://iso.qa.ubuntu.com] every "
-"%s seconds"
+"Checking available ISOs at the ISO tracker                        [http://"
+"iso.qa.ubuntu.com] every %s seconds"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:227
+#: ../bin/testdrive-gtk.py:244
 msgid "Unable to check the ISO tracker"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:265
+#: ../bin/testdrive-gtk.py:285
 #, python-format
 msgid "<b>Release:</b> %s"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:266
+#: ../bin/testdrive-gtk.py:286
 #, python-format
 msgid "<b>ISO Repository:</b> http://%s.ubuntu.com/"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:306
+#: ../bin/testdrive-gtk.py:329
 msgid "Add an ISO to TestDrive"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:322
+#: ../bin/testdrive-gtk.py:345
 msgid ""
-"Unable to open because 'testdrive' is not installed.\n"
+"Unable to open because 'testdrive'                                     is "
+"not installed.\n"
 "Please install testdrive: \n"
 "\n"
 "sudo apt-get install testdrive-cli"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:326
+#: ../bin/testdrive-gtk.py:350
 msgid "TestDrive an ISO or Disk Image"
 msgstr ""
 
 #. ##################################################################
 #. ## Obtains the command for the Sync process based on Protocol ####
 #. ##################################################################
-#: ../bin/testdrive-gtk.py:401
+#: ../bin/testdrive-gtk.py:430
 msgid "Obtaining the sync protocol for the specified ISO..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:404 ../bin/testdrive.py:375
+#: ../bin/testdrive-gtk.py:434 ../bin/testdrive.py:425
 #, python-format
 msgid "Unsupported protocol [%s]"
 msgstr ""
@@ -93,30 +94,34 @@
 #. #### Obtains the Virtualization Method, if not shows warnings ####
 #. ##################################################################
 #. Choose the virtualization engine
-#: ../bin/testdrive-gtk.py:415
+#: ../bin/testdrive-gtk.py:445
 msgid "Obtaining the virtualization method..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:419
-msgid "Your CPU supports KVM acceleration; please install KVM"
+#: ../bin/testdrive-gtk.py:449
+msgid ""
+"Your CPU supports KVM acceleration;                             please "
+"install KVM"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:420
+#: ../bin/testdrive-gtk.py:451
 msgid ""
-"Your CPU supports KVM acceleration; please install KVM:\n"
+"Your CPU supports KVM acceleration;                                   please "
+"install KVM:\n"
 "\n"
 "sudo apt-get install qemu-kvm"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:424
+#: ../bin/testdrive-gtk.py:456
 msgid ""
-"Your CPU does not support acceleration; run kvm-ok for more information; "
-"then install VBox"
+"Your CPU does not support acceleration;                           run kvm-ok "
+"for more information; then install VBox"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:425
+#: ../bin/testdrive-gtk.py:458
 msgid ""
-"Your CPU does not support acceleration; run kvm-ok for more information;\n"
+"Your CPU does not support acceleration;                                    "
+"run kvm-ok for more information;\n"
 "then please install VirtualBox\n"
 "\n"
 "kvm-ok\n"
@@ -127,292 +132,307 @@
 #. ### Obtains the list of ISO available from the iso list cache ####
 #. ##################################################################
 #. Try to retrieve the ISO list from the cache
-#: ../bin/testdrive-gtk.py:438 ../bin/testdrive.py:348
+#: ../bin/testdrive-gtk.py:472 ../bin/testdrive.py:398
 msgid "Retrieving the Ubuntu ISO list from cache..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:442 ../bin/testdrive-gtk.py:443
-#: ../bin/testdrive.py:352
+#: ../bin/testdrive-gtk.py:477 ../bin/testdrive-gtk.py:479
+#: ../bin/testdrive.py:402
 msgid "Unable to retrieve the Ubuntu ISO list from cache..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:563 ../bin/testdrive-gtk.py:598
-#: ../bin/testdrive-gtk.py:905
+#: ../bin/testdrive-gtk.py:604 ../bin/testdrive-gtk.py:652
+#: ../bin/testdrive-gtk.py:995
 #, python-format
 msgid "<i>     CACHE: [%s]</i>"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:565 ../bin/testdrive-gtk.py:600
-#: ../bin/testdrive-gtk.py:907
+#: ../bin/testdrive-gtk.py:609 ../bin/testdrive-gtk.py:658
+#: ../bin/testdrive-gtk.py:999
 msgid "<i>     CACHE: [empty]</i>"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:628
-msgid "<b><i>There are no Other ISOs yet...</i></b>"
+#: ../bin/testdrive-gtk.py:696
+msgid "<b><i>There are no Other                         ISOs yet...</i></b>"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:631
-msgid "<b><i>There are no ISOs for this architecture yet...</i></b>"
+#: ../bin/testdrive-gtk.py:700
+msgid ""
+"<b><i>There are no ISOs                         for this architecture yet..."
+"</i></b>"
 msgstr ""
 
 #. Add Button
-#: ../bin/testdrive-gtk.py:665
+#: ../bin/testdrive-gtk.py:737
 msgid "Add ISO"
 msgstr ""
 
 #. Create Buttons
-#: ../bin/testdrive-gtk.py:672
+#: ../bin/testdrive-gtk.py:744
 msgid "Create USB Disk"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:677
+#: ../bin/testdrive-gtk.py:750
 msgid "Sync"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:682
+#: ../bin/testdrive-gtk.py:755
 msgid "Launch"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:736 ../bin/testdrive.py:264
+#: ../bin/testdrive-gtk.py:814
 msgid "Using KVM for virtual machine hosting..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:739 ../bin/testdrive.py:266
+#: ../bin/testdrive-gtk.py:818
 msgid "Using VirtualBox for virtual machine hosting..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:742 ../bin/testdrive.py:268
+#: ../bin/testdrive-gtk.py:822
 msgid "Using Parallels Desktop for virtual machine hosting..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:796
+#: ../bin/testdrive-gtk.py:877
 msgid "sync_iso: Thread is executing..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:817
+#: ../bin/testdrive-gtk.py:899
 msgid "launch_iso: Thread is executing or syncing..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:824
+#: ../bin/testdrive-gtk.py:906
 msgid ""
 "No ISO has been selected.\n"
 "\n"
-"Please select an ISO to create an USB Startup Disk."
+"Please select an ISO to create an                                    USB "
+"Startup Disk."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:829
+#: ../bin/testdrive-gtk.py:912
 msgid ""
 "More than 1 ISO has been selected.\n"
 "\n"
 "Please select only 1 ISO to continue!"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:834
+#: ../bin/testdrive-gtk.py:917
 msgid ""
 "The specified ISO does not exist!\n"
 "\n"
-"Please, synchronize the ISO to continue."
+"Please synchronize the ISO to continue."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:841
+#: ../bin/testdrive-gtk.py:925
 msgid "Unable to launch USB Creator!"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:867
+#: ../bin/testdrive-gtk.py:953
 #, python-format
 msgid " Downloading %s (0%%)"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:887
+#: ../bin/testdrive-gtk.py:975
 #, python-format
 msgid " Downloading %s (%s%%)"
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:936
+#: ../bin/testdrive-gtk.py:1029
 msgid "    Configuring Virtual Machine..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:942
+#: ../bin/testdrive-gtk.py:1035
 msgid "     Running Virtual Machine..."
 msgstr ""
 
-#: ../bin/testdrive-gtk.py:991
+#: ../bin/testdrive-gtk.py:1089
 msgid "Show debug messages"
 msgstr ""
 
-#: ../bin/testdrive.py:52
+#: ../bin/testdrive.py:62
 msgid ""
 "\n"
 "Welcome to Testdrive!\n"
 msgstr ""
 
-#: ../bin/testdrive.py:60
+#: ../bin/testdrive.py:70
 #, python-format
 msgid "     +-cache--> [%s] %s"
 msgstr ""
 
-#: ../bin/testdrive.py:63
+#: ../bin/testdrive.py:76
 #, python-format
 msgid "  %d. Other (prompt for ISO URL)"
 msgstr ""
 
-#: ../bin/testdrive.py:65
+#: ../bin/testdrive.py:78
 msgid ""
 "\n"
 "Select an image to testdrive [1]: "
 msgstr ""
 
-#: ../bin/testdrive.py:74
+#: ../bin/testdrive.py:87
 msgid ""
 "\n"
 "ERROR: Invalid input\n"
 msgstr ""
 
-#: ../bin/testdrive.py:77
+#: ../bin/testdrive.py:90
 msgid ""
 "\n"
 "Enter an ISO URL to testdrive: "
 msgstr ""
 
-#: ../bin/testdrive.py:84
+#: ../bin/testdrive.py:97
 msgid ""
 "\n"
 "ERROR: Invalid selection\n"
 msgstr ""
 
-#: ../bin/testdrive.py:88
+#: ../bin/testdrive.py:102
 #, python-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../bin/testdrive.py:102 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:155
+#: ../bin/testdrive.py:118 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:161
 #, python-format
 msgid "Invalid ISO URL [%s]"
 msgstr ""
 
-#: ../bin/testdrive.py:144
+#: ../bin/testdrive.py:167
 #, python-format
 msgid ""
 "Command failed\n"
 "    `%s`"
 msgstr ""
 
-#: ../bin/testdrive.py:151
+#: ../bin/testdrive.py:176
 msgid "Launching Virtual Machine using CURSES as screen mode"
 msgstr ""
 
-#: ../bin/testdrive.py:196
+#: ../bin/testdrive.py:226
 msgid "user configuration file (overriding default values"
 msgstr ""
 
-#: ../bin/testdrive.py:198
+#: ../bin/testdrive.py:229
 msgid "print version and system data, and exit"
 msgstr ""
 
-#: ../bin/testdrive.py:200
+#: ../bin/testdrive.py:232
 msgid "get ISO image from this URL location"
 msgstr ""
 
-#: ../bin/testdrive.py:202
+#: ../bin/testdrive.py:235
 msgid "try to launch usb-creator for further testing"
 msgstr ""
 
-#: ../bin/testdrive.py:204
+#: ../bin/testdrive.py:238
 msgid "hardcode Ubuntu RELEASE codename"
 msgstr ""
 
-#: ../bin/testdrive.py:206
+#: ../bin/testdrive.py:241
 msgid ""
 "hardcode Ubuntu flavor. Available Flavors:\n"
-"             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/"
-"ubuntukylin"
+"             ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/             "
+"ubuntustudio/lubuntu/ubuntukylin"
 msgstr ""
 
-#: ../bin/testdrive.py:209
+#: ../bin/testdrive.py:246
 msgid ""
 "hardcode Ubuntu repository from where to obtain ISOs:\n"
 "             releases/cdimage/cloud-daily/cloud-releases"
 msgstr ""
 
-#: ../bin/testdrive.py:212
-msgid "displays the Virtual Machine in the shell. Only valid for Cloud images."
+#: ../bin/testdrive.py:250
+msgid ""
+"displays the Virtual Machine in the shell.             Only valid for Cloud "
+"images."
 msgstr ""
 
-#: ../bin/testdrive.py:217
+#: ../bin/testdrive.py:257
 #, python-format
 msgid "version passed: %s"
 msgstr ""
 
-#: ../bin/testdrive.py:221
+#: ../bin/testdrive.py:262
 #, python-format
 msgid "testdrive %s"
 msgstr ""
 
-#: ../bin/testdrive.py:233
+#: ../bin/testdrive.py:276
 #, python-format
 msgid "config passed: %s"
 msgstr ""
 
-#: ../bin/testdrive.py:243
+#: ../bin/testdrive.py:286
 #, python-format
 msgid "Trying config in %s"
 msgstr ""
 
-#: ../bin/testdrive.py:247
+#: ../bin/testdrive.py:290
 #, python-format
 msgid "Using configuration in %s"
 msgstr ""
 
-#: ../bin/testdrive.py:249
+#: ../bin/testdrive.py:292
 #, python-format
 msgid "Invalid configuration [%s]"
 msgstr ""
 
-#: ../bin/testdrive.py:257
+#: ../bin/testdrive.py:300
 msgid ""
 "Your CPU supports KVM acceleration; please install KVM:\n"
 "            sudo apt-get install qemu-kvm"
 msgstr ""
 
-#: ../bin/testdrive.py:260
+#: ../bin/testdrive.py:303
 msgid ""
-"Your CPU does not support acceleration; run kvm-ok for more information; "
-"then please install VirtualBox:\n"
+"Your CPU does not support acceleration; run kvm-ok for more         "
+"information; then please install VirtualBox:\n"
 "            kvm-ok\n"
 "            sudo apt-get install virtualbox"
 msgstr ""
 
-#: ../bin/testdrive.py:284
+#: ../bin/testdrive.py:308
+msgid "Using KVM for virtual machine hosting."
+msgstr ""
+
+#: ../bin/testdrive.py:310
+msgid "Using VirtualBox for virtual machine hosting."
+msgstr ""
+
+#: ../bin/testdrive.py:312
+msgid "Using Parallels Desktop for virtual machine hosting."
+msgstr ""
+
+#: ../bin/testdrive.py:329
 msgid ""
-"Launching Cloud images only works with KVM. Please switch your "
-"virtualization method..."
+"Launching Cloud images only works with KVM. Please                 switch "
+"your virtualization method..."
 msgstr ""
 
-#: ../bin/testdrive.py:335
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:339
+#: ../bin/testdrive.py:384
 #, python-format
 msgid "Obtaining Ubuntu ISO list from %s..."
 msgstr ""
 
-#: ../bin/testdrive.py:339
+#: ../bin/testdrive.py:388
 #, python-format
 msgid "ERROR: Could not obtain the Ubuntu ISO list from %s..."
 msgstr ""
 
-#: ../bin/testdrive.py:345
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:351
+#: ../bin/testdrive.py:395
 msgid "Unable to update the Ubuntu ISO list cache..."
 msgstr ""
 
 #. BUG: should check disk space availability in CACHE dir
 #. Update the cache
-#: ../bin/testdrive.py:371
+#: ../bin/testdrive.py:421
 msgid "Syncing the specified ISO..."
 msgstr ""
 
-#: ../bin/testdrive.py:378 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:167
+#: ../bin/testdrive.py:429 ../testdrivegtk/AddOtherTestdrivegtkDialog.py:174
 #, python-format
 msgid "ISO not found at [%s]"
 msgstr ""
@@ -420,75 +440,78 @@
 #. ##################
 #. # Launch the VM ##
 #. ##################
-#: ../bin/testdrive.py:401
+#: ../bin/testdrive.py:453
 msgid "Validating Virtualization Method...."
 msgstr ""
 
-#: ../bin/testdrive.py:405
+#: ../bin/testdrive.py:457
 #, python-format
 msgid "Unable to validate Virtualization Method [%s]"
 msgstr ""
 
-#: ../bin/testdrive.py:407
+#: ../bin/testdrive.py:459
 msgid "Setting up Virtual Machine..."
 msgstr ""
 
-#: ../bin/testdrive.py:411
+#: ../bin/testdrive.py:463
 msgid "Unable to setup Virtual Machine"
 msgstr ""
 
-#: ../bin/testdrive.py:413
+#: ../bin/testdrive.py:465
 msgid "Launching Virtual Machine..."
 msgstr ""
 
-#: ../bin/testdrive.py:421
+#: ../bin/testdrive.py:473
 msgid "Unable to launch Virtual Machine"
 msgstr ""
 
-#: ../bin/testdrive.py:425
+#: ../bin/testdrive.py:477
 #, python-format
 msgid "Cleaning up disk image [%s]..."
 msgstr ""
 
 #. Remind about cache cleanup
-#: ../bin/testdrive.py:428
+#: ../bin/testdrive.py:480
 msgid "You may wish to clean up the cache directory..."
 msgstr ""
 
-#: ../bin/testdrive.py:429
+#: ../bin/testdrive.py:481
 #, python-format
 msgid "      %s and %s"
 msgstr ""
 
-#: ../bin/testdrive.py:436
+#: ../bin/testdrive.py:490
 msgid ""
 "\n"
-"Launch USB Startup Disk Creator for further testing of this ISO? [y/N] "
+"Launch USB Startup Disk Creator for             further testing of this ISO? "
+"[y/N] "
 msgstr ""
 
-#: ../bin/testdrive.py:440
+#: ../bin/testdrive.py:495
 msgid ""
 "\n"
 "Press <enter> to exit..."
 msgstr ""
 
-#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:135
+#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:140
 msgid "Please insert a Description"
 msgstr ""
 
-#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:140
+#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:145
 msgid "Please insert a URL"
 msgstr ""
 
-#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:171
-msgid "No sync protocol has been selected, please select one."
+#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:178
+msgid ""
+"No sync protocol has been selected,                                 please "
+"select one."
 msgstr ""
 
-#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:196
+#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:204
 msgid "Description"
 msgstr ""
 
-#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:227
+#: ../testdrivegtk/AddOtherTestdrivegtkDialog.py:238
 msgid "Select Protocol:"
 msgstr ""
 
@@ -497,54 +520,76 @@
 msgid "Other..."
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:72
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:73
 msgid "TestDrive Preferences"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:98
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:99
 msgid "finish_initialization()"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:138
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:143
 msgid "Select Repository:"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:149
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:496
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:155
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:532
 msgid "Select Release:"
 msgstr ""
 
 #. Load config files for local variables
 #. self.load_config_files(file)
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:217
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:238
 #, python-format
 msgid "Reading config file: [%s]"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:219
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:241
 #, python-format
 msgid "Unable to load config file [%s]"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:282
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:305
 #, python-format
 msgid " of %s available."
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:343
-#, python-format
-msgid "Could not obtain the Ubuntu ISO list from %s..."
-msgstr ""
-
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:347
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:366
+#, python-format
+msgid ""
+"\n"
+"                Obtaining Ubuntu ISO list from %s...\n"
+"                "
+msgstr ""
+
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:372
+#, python-format
+msgid ""
+"\n"
+"                     Could not obtain the Ubuntu ISO list from %s...\n"
+"                     "
+msgstr ""
+
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:378
 msgid "Updating the Ubuntu ISO list cache..."
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:355
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:382
+msgid ""
+"\n"
+"                    Unable to update the Ubuntu ISO list cache...\n"
+"                    "
+msgstr ""
+
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:388
 msgid "get_preferences()"
 msgstr ""
 
-#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:478
+#: ../testdrivegtk/PreferencesTestdrivegtkDialog.py:512
 #, python-format
 msgid "Unable to clean up files from [%s]"
 msgstr ""
+
+#: ../testdrivegtk/AboutTestdrivegtkDialog.py:48
+msgid "PyGTK Front-end for TestDrive"
+msgstr ""
 
=== modified file 'setup.py'
--- setup.py	2013-08-27 16:31:59 +0000
+++ setup.py	2013-10-06 20:59:44 +0000
@@ -2,24 +2,25 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
+
+################# DO NOT TOUCH THIS (HEAD TO THE SECOND PART) #################
 
 import os
 import sys
@@ -28,9 +29,11 @@
 try:
     import DistUtilsExtra.auto
 except ImportError:
-    print >> sys.stderr, 'To build testdrivegtk you need https://launchpad.net/python-distutils-extra'
+    print >> sys.stderr, 'To build testdrive you need python-distutils-extra'
     sys.exit(1)
-assert DistUtilsExtra.auto.__version__ >= '2.18', 'needs DistUtilsExtra.auto >= 2.18'
+assert DistUtilsExtra.auto.__version__ >= '2.18', \
+    'needs DistUtilsExtra.auto >= 2.18'
+
 
 def update_data_path(prefix, oldvalue=None):
 
@@ -38,14 +41,14 @@
         fin = file('testdrivegtk/testdrivegtkconfig.py', 'r')
         fout = file(fin.name + '.new', 'w')
 
-        for line in fin:            
-            fields = line.split(' = ') # Separate variable from value
+        for line in fin:
+            fields = line.split(' = ')  # Separate variable from value
             if fields[0] == '__testdrivegtk_data_directory__':
                 # update to prefix, store oldvalue
                 if not oldvalue:
                     oldvalue = fields[1]
                     line = "%s = '%s'\n" % (fields[0], prefix)
-                else: # restore oldvalue
+                else:  # restore oldvalue
                     line = "%s = %s" % (fields[0], oldvalue)
             fout.write(line)
 
@@ -53,7 +56,7 @@
         fout.close()
         fin.close()
         os.rename(fout.name, fin.name)
-    except (OSError, IOError), e:
+    except (OSError, IOError):
         print ("ERROR: Can't find testdrivegtk/testdrivegtkconfig.py")
         sys.exit(1)
     return oldvalue
@@ -65,7 +68,7 @@
         fin = file('testdrive-gtk.desktop.in', 'r')
         fout = file(fin.name + '.new', 'w')
 
-        for line in fin:            
+        for line in fin:
             if 'Icon=' in line:
                 line = "Icon=%s\n" % (datadir + 'media/testdrive-gtk.xpm')
             fout.write(line)
@@ -73,7 +76,7 @@
         fout.close()
         fin.close()
         os.rename(fout.name, fin.name)
-    except (OSError, IOError), e:
+    except (OSError, IOError):
         print ("ERROR: Can't find testdrive-gtk.desktop.in")
         sys.exit(1)
 
@@ -86,10 +89,9 @@
         update_data_path(self.prefix, previous_value)
 
 
-        
-##################################################################################
-###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################
-##################################################################################
+###############################################################################
+#################### YOU SHOULD MODIFY ONLY WHAT IS BELOW #####################
+###############################################################################
 
 DistUtilsExtra.auto.setup(
     name='testdrive',
@@ -100,11 +102,11 @@
     description='Test Drive an Ubuntu ISO',
     long_description='Download and run an Ubuntu ISO in a Virtual Machine',
     url='https://launchpad.net/testdrive',
-    packages=[  'testdrive',
+    packages=['testdrive',
             'testdrive.virt',
             'testdrivegtk'],
     scripts=['bin/testdrive', 'bin/testdrive-gtk'],
-    data_files=[    ('/etc', ['testdriverc']),
+    data_files=[('/etc', ['testdriverc']),
             ('share/testdrive', ['testdriverc']),
             ('share/testdrivegtk/ui', glob('data/ui/*.ui')),
             ('share/testdrivegtk/ui', glob('data/ui/*.xml')),
@@ -112,8 +114,8 @@
             ('share/testdrivegtk/media', glob('data/media/*.svg'))
             #('share/pixmaps', glob('data/media/testdrive-gtk.xpm')),
             #('share/testdrivegtk/indicator', glob('indicator/testdrive-gtk'))
-            #('share/indicators/messages/applications', glob('indicator/testdrive-gtk'))
-            ],
+            #('share/indicators/messages/applications',
+            #   glob('indicator/testdrive-gtk'))
+        ],
     cmdclass={'install': InstallAndUpdateDataDirectory}
     )
-
 
=== modified file 'testdrive/testdrive.py'
--- testdrive/testdrive.py	2013-08-10 09:59:15 +0000
+++ testdrive/testdrive.py	2013-10-06 20:59:44 +0000
@@ -19,9 +19,16 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, platform, commands, tempfile, hashlib, ConfigParser, time
+import os
+import platform
+import commands
+import tempfile
+import hashlib
+import ConfigParser
+import time
 import xdg.BaseDirectory
 
+
 class Testdrive:
     def __init__(self, pkg_section):
         self.HOME = os.getenv("HOME", "")
@@ -42,10 +49,11 @@
         self.PROTO = None
         self.ISO_PATH_HEADER = None
         self.PKG_SECTION = pkg_section
-        self.r = None #Release (maverick, lucid, etc)
-        self.m = None #Arch (amd64, i386)
-        self.f = None #Flavor (ubuntu, kubuntu, etc)
-        self.p = None # Ubuntu ISO Repository (cdimage, releases, cloud-daily, cloud-releases)
+        self.r = None  # Release (precise, saucy, etc)
+        self.m = None  # Arch (amd64, i386)
+        self.f = None  # Flavor (ubuntu, kubuntu, etc)
+        self.p = None  # Ubuntu ISO Repository
+                       # (cdimage, releases, cloud-daily, cloud-releases)
 
     def set_values(self, var, value):
         if var == 'kvm_args':
@@ -95,7 +103,8 @@
         except:
             pass
 
-    ## TODO: This possible needs to go outside the class due to in PyGTK front end we might need the list of ISO's before even instancing an object
+    ## TODO: This possible needs to go outside the class due to in PyGTK front
+    ## end we might need the list of ISO's before even instancing an object
     def list_isos(self, ISOS):
         ISO = []
         for iso in ISOS:
@@ -141,19 +150,23 @@
                 url = iso.split()[2]
                 if self.p == 'cloud-daily' or self.p == 'cloud-releases':
                     arch = url.split(".tar.gz")[0].split("-")[-1]
-                    name = "%s" % flavor 
+                    name = "%s" % flavor
                 else:
                     arch = url.split(".iso")[0].split("-")[-1]
-                    image = url.split("-%s.iso" % arch)[0].split("-")[-1].capitalize()
+                    image = url.split("-%s.iso" % arch)[0].split(
+                        "-")[-1].capitalize()
                     if image == 'Dvd':
-                        image = url.split("-%s.iso" % arch)[0].split("-")[-1].swapcase()
+                        image = url.split("-%s.iso" % arch)[0].split(
+                            "-")[-1].swapcase()
                     name = "%s %s" % (flavor, image)
                 # Name: Shows a description
                 # URL: Shows the URL from where it downloads the ISO
                 # Arch: Shows the architecture (amd64|i386)
-                # Category: The header used to save the ISO, i.e.: ubuntu_lucid-desktop-i386.iso kubuntu_lucid-desktop-i386.iso
+                # Category: The header used to save the ISO, i.e.:
+                # ubuntu_saucy-desktop-i386.iso kubuntu_saucy-desktop-i386.iso
                 if arch in self.m:
-                    ISO.append({"name":name, "url":"%s%s" % (self.u, url), "arch":arch, "category":category})
+                    ISO.append({"name": name, "url": "%s%s" % (self.u, url),
+                                "arch": arch, "category": category})
         return ISO
 
     def get_virt(self):
@@ -165,7 +178,9 @@
                 acceleration = 1
         else:
             # Okay, we don't have kvm-ok, so let's hack it...
-            if commands.getstatusoutput("egrep \"^flags.*:.*(svm|vmx)\" /proc/cpuinfo")[0] == 0:
+            if commands.getstatusoutput(
+                "egrep \"^flags.*:.*(svm|vmx)\" /proc/cpuinfo"
+            )[0] == 0:
                 acceleration = 1
         # Prefer KVM if acceleration available and installed
         if acceleration == 1 and commands.getstatusoutput("which kvm")[0] == 0:
@@ -186,7 +201,8 @@
         # Set defaults where undefined
         if self.CACHE is None:
             if xdg.BaseDirectory.xdg_cache_home:
-                self.CACHE = "%s/%s" % (xdg.BaseDirectory.xdg_cache_home, self.PKG)
+                self.CACHE = "%s/%s" % (
+                    xdg.BaseDirectory.xdg_cache_home, self.PKG)
             else:
                 self.CACHE = "%s/.cache/%s" % (self.HOME, self.PKG)
 
@@ -214,7 +230,8 @@
             self.DISK_SIZE = "6G"
 
         if len(self.MEM) == 0:
-            total = commands.getoutput("grep ^MemTotal /proc/meminfo | awk '{print $2}'")
+            total = commands.getoutput(
+                "grep ^MemTotal /proc/meminfo | awk '{print $2}'")
             if total > 4000000:
                 self.MEM = "2048"
             elif total > 2000000:
@@ -227,15 +244,16 @@
                 self.MEM = "256"
 
         if len(self.KVM_ARGS) == 0:
-            self.KVM_ARGS = "-usb -usbdevice tablet -net nic,model=virtio -net user -soundhw es1370"
+            self.KVM_ARGS = "-usb -usbdevice tablet -net nic,model=virtio",
+            "-net user -soundhw es1370"
 
         if len(self.VBOX_NAME) == 0:
             self.VBOX_NAME = self.PKG
 
-        if self.ISO_PATH_HEADER == None:
+        if self.ISO_PATH_HEADER is None:
             self.ISO_PATH_HEADER = 'other'
 
-        if self.f == None:
+        if self.f is None:
             self.f = 'ubuntu'
 
         if self.m is None:
@@ -244,7 +262,7 @@
             else:
                 self.m = ["i386"]
 
-        if self.p == None:
+        if self.p is None:
             self.p = 'cdimage'
 
         if self.p == 'cdimage':
@@ -263,11 +281,14 @@
         if self.PROTO == "rsync":
             cmd = "rsync -azPL %s %s" % (self.ISO_URL, self.PATH_TO_ISO)
             return cmd
-        elif self.PROTO == "zsync" or self.PROTO == "http" or self.PROTO == "ftp":
+        elif self.PROTO == "zsync" or \
+                self.PROTO == "http" or self.PROTO == "ftp":
             if commands.getstatusoutput("which zsync")[0] == 0:
                 if self.ISO_URL.partition("://")[0] == "zsync":
                     self.ISO_URL = self.ISO_URL.replace('zsync', 'http')
-                cmd = "cd '%s' && zsync %s.zsync -o %s" % (self.CACHE_ISO, self.ISO_URL, self.PATH_TO_ISO)
+                cmd = "cd '%s' && zsync %s.zsync -o %s" % (
+                    self.CACHE_ISO, self.ISO_URL, self.PATH_TO_ISO
+                    )
                 return cmd
             else:
                 cmd = "wget %s -O %s" % (self.ISO_URL, self.PATH_TO_ISO)
@@ -276,7 +297,8 @@
             # If the iso is on file:///, use the ISO in place
             self.PATH_TO_ISO = self.ISO_URL.partition("://")[2]
             # Get absolute path if a relative path is used
-            DIR = commands.getoutput("cd `dirname '%s'` && pwd" % self.PATH_TO_ISO)
+            DIR = commands.getoutput("cd `dirname '%s'` && pwd" %
+                                     self.PATH_TO_ISO)
             FILE = os.path.basename("%s" % self.PATH_TO_ISO)
             self.PATH_TO_ISO = "%s/%s" % (DIR, FILE)
             return 0
@@ -299,10 +321,11 @@
         else:
             rm_disk = False
 
-        # If disk image is stock (e.g., you just ran a LiveCD, no installation),
+        # If disk image is stock (e.g. you just ran a LiveCD, no installation),
         # purge it automatically.
         if os.path.exists(self.DISK_FILE):
-            if os.path.getsize(self.DISK_FILE) == 262144 and self.md5sum(self.DISK_FILE) == "1da7553f642332ec9fb58a6094d2c8ef":
+            if os.path.getsize(self.DISK_FILE) == 262144 and self.md5sum(
+               self.DISK_FILE) == "1da7553f642332ec9fb58a6094d2c8ef":
                 # Clean up kvm qcow2 image
                 rm_disk = True
             if os.path.getsize(self.DISK_FILE) == 24576:
@@ -321,18 +344,22 @@
 
     def set_launch_path(self):
         # Move from set_defaults, due to merge of upstream rev 189
-        ISO_NAME = "%s_%s" % (self.ISO_PATH_HEADER, os.path.basename(self.ISO_URL))
+        ISO_NAME = "%s_%s" % (self.ISO_PATH_HEADER,
+                              os.path.basename(self.ISO_URL))
         self.PROTO = self.ISO_URL.partition(":")[0]
         self.PATH_TO_ISO = "%s/%s" % (self.CACHE_ISO, ISO_NAME)
 
     def launch_usb_creator(self):
         if os.path.exists("/usr/bin/usb-creator-gtk"):
-            os.execv("/usr/bin/usb-creator-gtk", ["usb-creator-gtk", "-i", self.PATH_TO_ISO])
+            os.execv("/usr/bin/usb-creator-gtk",
+                     ["usb-creator-gtk", "-i", self.PATH_TO_ISO])
         else:
-            os.execv("/usr/bin/usb-creator-kde", ["usb-creator-kde", "-i", self.PATH_TO_ISO])
+            os.execv("/usr/bin/usb-creator-kde",
+                     ["usb-creator-kde", "-i", self.PATH_TO_ISO])
 
     def is_disk_empty(self):
-        (status, output) = commands.getstatusoutput("file %s | grep -qs 'empty'" % self.DISK_FILE)
+        (status, output) = commands.getstatusoutput(
+            "file %s | grep -qs 'empty'" % self.DISK_FILE)
         if status == 0:
             return True
         return False
@@ -346,7 +373,8 @@
         return True
 
     def is_iso_list_cache_expired(self):
-        cache_time = time.localtime(os.path.getmtime("%s/%s.isos" % (self.CACHE, self.p)))
+        cache_time = time.localtime(os.path.getmtime(
+            "%s/%s.isos" % (self.CACHE, self.p)))
         local_time = time.localtime()
         time_difference = time.mktime(local_time) - time.mktime(cache_time)
         # Check for new release at most every 12hrs (60*60*12 = 43200)
@@ -356,18 +384,26 @@
 
     def obtain_ubuntu_iso_list_from_repo(self):
         if self.p == 'cdimage':
-            (status, output) = commands.getstatusoutput("wget -q -O- http://cdimage.ubuntu.com/.manifest-daily | egrep '(amd64|i386)' | egrep '(current)'")
+            (status, output) = commands.getstatusoutput(
+                "wget -q -O- http://cdimage.ubuntu.com/.manifest-daily "
+                "| egrep '(amd64|i386)' | egrep '(current)'")
         elif self.p == 'releases':
-            (status, output) = commands.getstatusoutput("wget -q -O- http://releases.ubuntu.com/.manifest | egrep '(amd64|i386)'")
+            (status, output) = commands.getstatusoutput(
+                "wget -q -O- http://releases.ubuntu.com/.manifest "
+                "| egrep '(amd64|i386)'")
         elif self.p == 'cloud-daily':
-            (status, output) = commands.getstatusoutput("wget -q -O- http://cloud-images.ubuntu.com/.manifest-daily | egrep '(amd64|i386)'")
+            (status, output) = commands.getstatusoutput(
+                "wget -q -O- http://cloud-images.ubuntu.com/.manifest-daily "
+                "| egrep '(amd64|i386)'")
         elif self.p == 'cloud-releases':
-            (status, output) = commands.getstatusoutput("wget -q -O- http://cloud-images.ubuntu.com/.manifest | egrep '(amd64|i386)'")
+            (status, output) = commands.getstatusoutput(
+                "wget -q -O- http://cloud-images.ubuntu.com/.manifest "
+                "| egrep '(amd64|i386)'")
         return output
 
     def update_ubuntu_iso_list_cache(self, str):
         try:
-            f = open("%s/%s.isos" % (self.CACHE, self.p),'w')
+            f = open("%s/%s.isos" % (self.CACHE, self.p), 'w')
             f.write(str)
             f.close
         except IOError:
@@ -390,16 +426,19 @@
         self.r = codename[-1]
 
     def create_disk_file(self):
-        return tempfile.mkstemp(".img", "testdrive-disk-", "%s" % self.CACHE_IMG)[1]
+        return tempfile.mkstemp(".img", "testdrive-disk-",
+                                "%s" % self.CACHE_IMG)[1]
 
     def prepare_cloud_img_tarball(self):
         untar = False
-        TAR_BASENAME = os.path.basename(self.PATH_TO_ISO).split(".tar.gz")[0].split("_")[-1]
+        TAR_BASENAME = os.path.basename(self.PATH_TO_ISO).split(
+            ".tar.gz")[0].split("_")[-1]
         ORIG_DISK_NAME = "%s.img" % TAR_BASENAME
         FLOPPY_NAME = "%s-floppy" % TAR_BASENAME
 
         image_path = "%s/%s" % (self.CACHE_ISO, ORIG_DISK_NAME)
         floppy_path = "%s/%s" % (self.CACHE_ISO, FLOPPY_NAME)
 
-        cmd = 'cd %s && tar Szxvf %s %s %s' % (self.CACHE_ISO, self.PATH_TO_ISO, ORIG_DISK_NAME, FLOPPY_NAME)
+        cmd = 'cd %s && tar Szxvf %s %s %s' % (
+            self.CACHE_ISO, self.PATH_TO_ISO, ORIG_DISK_NAME, FLOPPY_NAME)
         os.system(cmd)
 
=== modified file 'testdrive/virt/kvm.py'
--- testdrive/virt/kvm.py	2013-05-20 17:12:31 +0000
+++ testdrive/virt/kvm.py	2013-10-06 20:59:44 +0000
@@ -19,10 +19,14 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import commands, os, uuid, logging
+import commands
+import os
+import uuid
+import logging
 
 logger = logging.getLogger("testdrive.virt.kvm")
 
+
 class KVM:
 
     def __init__(self, td):
@@ -36,7 +40,8 @@
         self.DISK_SIZE = td.DISK_SIZE
 
     def is_disk_empty(self):
-        (status, output) = commands.getstatusoutput("file %s | grep -qs 'empty'" % self.DISK_FILE)
+        (status, output) = commands.getstatusoutput(
+            "file %s | grep -qs 'empty'" % self.DISK_FILE)
         if status == 0:
             return True
         return False
@@ -50,23 +55,32 @@
     # Code to setup virtual machine
     def setup_virt(self):
         if self.p == 'cloud-daily' or self.p == 'cloud-releases':
-            #path = "%s/%s" % (self.CACHE_ISO, self.PATH_TO_ISO.split(".tar.gz")[0].split("_")[-1])
-            path = "%s/%s" % (self.CACHE_ISO, os.path.basename(self.PATH_TO_ISO).split(".tar.gz")[0])
+            #path = "%s/%s" % (self.CACHE_ISO, self.PATH_TO_ISO.split(
+            #    ".tar.gz")[0].split("_")[-1])
+            path = "%s/%s" % (self.CACHE_ISO, os.path.basename(
+                self.PATH_TO_ISO).split(".tar.gz")[0])
             self.ORIG_DISK = "%s.img" % path
             self.FLOPPY_FILE = "%s-floppy" % path
-            self.run_or_die("kvm-img create -f qcow2 -b %s %s" % (self.ORIG_DISK, self.DISK_FILE))
+            self.run_or_die("kvm-img create -f qcow2 -b %s %s" % (
+                self.ORIG_DISK, self.DISK_FILE))
         elif not os.path.exists(self.DISK_FILE) or self.is_disk_empty():
             logger.info("Creating disk image [%s]..." % self.DISK_FILE)
-            self.run_or_die("kvm-img create -f qcow2 %s %s" % (self.DISK_FILE, self.DISK_SIZE))
+            self.run_or_die("kvm-img create -f qcow2 %s %s" % (
+                self.DISK_FILE, self.DISK_SIZE))
 
     # Code launch virtual machine
     def launch_virt(self):
         logger.info("Running the Virtual Machine...")
         UUID = uuid.uuid4()
         if self.p == 'cloud-daily' or self.p == 'cloud-releases':
-            cmd = "qemu-system-x86_64 -uuid %s -boot a -fda %s -drive file=%s,if=virtio %s" % (UUID, self.FLOPPY_FILE, self.DISK_FILE, self.KVM_ARGS)
+            cmd = "qemu-system-x86_64 -uuid %s -boot a -fda %s -drive file=%s,"
+            "if=virtio %s" % (
+                UUID, self.FLOPPY_FILE, self.DISK_FILE, self.KVM_ARGS)
         else:
-            cmd = "qemu-system-x86_64 -uuid %s -m %s -smp %s -cdrom %s -drive file=%s,if=virtio,cache=writeback,index=0 %s" % (UUID, self.MEM, self.SMP, self.PATH_TO_ISO, self.DISK_FILE, self.KVM_ARGS)
+            cmd = "qemu-system-x86_64 -uuid %s -m %s -smp %s -cdrom %s -drive",
+            "file=%s,if=virtio,cache=writeback,index=0 %s" % (
+                UUID, self.MEM, self.SMP, self.PATH_TO_ISO,
+                self.DISK_FILE, self.KVM_ARGS)
         return cmd
 
     def run(self, cmd):
 
=== modified file 'testdrive/virt/parallels.py'
--- testdrive/virt/parallels.py	2012-04-21 02:05:42 +0000
+++ testdrive/virt/parallels.py	2013-10-06 20:59:44 +0000
@@ -19,7 +19,10 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import commands, os, time
+import commands
+import os
+#import time
+
 
 class Parallels:
 
@@ -34,7 +37,9 @@
 
     # Code to validate if virtualization is installed/supported
     def validate_virt(self):
-        if commands.getstatusoutput("prlctl list %s | grep -qsv \"UUID\"" % self.VBOX_NAME)[0] == 0:
+        if commands.getstatusoutput(
+            "prlctl list %s | grep -qsv \"UUID\"" % self.VBOX_NAME
+        )[0] == 0:
             self.run_or_die("prlctl delete %s" % self.VBOX_NAME)
 
     # Code to setup virtual machine
@@ -42,18 +47,24 @@
         self.DISK_SIZE = self.DISK_SIZE.replace("G", "000")
         #info("Creating VM...")
         print "INFO: Creating VM..."
-        self.run_or_die("prlctl create %s --ostype linux --distribution ubuntu" % self.VBOX_NAME)
-        self.run_or_die("prlctl set %s --memsize %s" % (self.VBOX_NAME, self.MEM))
+        self.run_or_die("prlctl create %s --ostype linux --distribution ubuntu"
+                        % self.VBOX_NAME)
+        self.run_or_die("prlctl set %s --memsize %s" % (
+            self.VBOX_NAME, self.MEM))
         self.run_or_die("prlctl set %s --device-del hdd0" % self.VBOX_NAME)
-        self.run_or_die("prlctl set %s --device-add hdd --type expand --size %s --iface scsi --position 0:0" % (self.VBOX_NAME, self.DISK_SIZE))
-        self.run_or_die("prlctl set %s --device-set cdrom0 --image %s" % (self.VBOX_NAME, self.PATH_TO_ISO))
+        self.run_or_die("prlctl set %s --device-add hdd --type expand --size",
+                        "%s --iface scsi --position 0:0" % (
+                            self.VBOX_NAME, self.DISK_SIZE))
+        self.run_or_die("prlctl set %s --device-set cdrom0 --image %s" % (
+            self.VBOX_NAME, self.PATH_TO_ISO))
 
     # Code launch virtual machine
     def launch_virt(self):
         #self.run_or_die("prlctl start %s" % self.td.VBOX_NAME)
         return "prlctl start %s" % self.VBOX_NAME
         # Loop as long as this VM is running
-        #while commands.getstatusoutput("prlctl list %s | grep -qs stopped" % self.td.VBOX_NAME)[0] != 0:
+        #while commands.getstatusoutput(
+        #"prlctl list %s | grep -qs stopped" % self.td.VBOX_NAME)[0] != 0:
         #   time.sleep(2)
 
     def run(self, cmd):
 
=== modified file 'testdrive/virt/virtualbox.py'
--- testdrive/virt/virtualbox.py	2013-09-19 06:13:32 +0000
+++ testdrive/virt/virtualbox.py	2013-10-06 20:59:44 +0000
@@ -19,10 +19,14 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import commands, os, time, logging
+import commands
+import os
+#import time
+import logging
 
 logger = logging.getLogger("testdrive.virt.vbox")
 
+
 class VBox:
 
     def __init__(self, td):
@@ -37,72 +41,98 @@
         self.ISO_URL = td.ISO_URL
 
     def is_disk_empty(self):
-        (status, output) = commands.getstatusoutput("file %s | grep -qs 'empty'" % self.DISK_FILE)
+        (status, output) = commands.getstatusoutput(
+            "file %s | grep -qs 'empty'" % self.DISK_FILE)
         if status == 0:
             return True
         return False
 
     # Code to validate if virtualization is installed/supported
     def validate_virt(self):
-        # Determine which version of VirtualBox we have installed.  What is returned is
-        # typically a string such as '4.1.0r55467', lets assume that the command line
-        # is consistent within 4.x.x versions extract this part of the
-        # version string for comparison later
+        # Determine which version of VirtualBox we have installed.  What is
+        # returned is typically a string such as '4.1.0r55467', lets assume
+        # that the command line is consistent within 4.x.x versions extract
+        # this part of the version string for comparison later
         self.vboxversion = commands.getoutput("VBoxManage --version")
-        self.vboxversion = ( int(self.vboxversion.split(".")[0]), int(self.vboxversion.split(".")[1]) )
-        if self.vboxversion == (4,0) or self.vboxversion == (4,1) or self.vboxversion == (4,2):
+        self.vboxversion = (int(self.vboxversion.split(".")[0]),
+                            int(self.vboxversion.split(".")[1]))
+        if self.vboxversion == (4, 0) or self.vboxversion == (4, 1) \
+           or self.vboxversion == (4, 2):
             logger.info("VirtualBox %s.%s detected." % self.vboxversion)
         else:
-            logger.error("ERROR: Unsupported version (%s.%s) of VirtualBox; please install v4.0, v4.1 or v4.2." % self.vboxversion)
+            logger.error(
+                "ERROR: Unsupported version (%s.%s) of VirtualBox; please",
+                "install v4.0, v4.1 or v4.2." % self.vboxversion)
             exit(0)
 
     # Code to setup virtual machine
     def setup_virt(self):
-        self.run("sed -i \":HardDisk.*%s:d\" %s/.VirtualBox/VirtualBox.xml" % (self.DISK_FILE, self.HOME))
+        self.run("sed -i \":HardDisk.*%s:d\" %s/.VirtualBox/VirtualBox.xml"
+                 % (self.DISK_FILE, self.HOME))
         if self.is_disk_empty():
             os.unlink(self.DISK_FILE)
         if not os.path.exists(self.DISK_FILE):
             self.DISK_SIZE = self.DISK_SIZE.replace("G", "000")
             logger.info("Creating disk image...")
-            self.run_or_die("VBoxManage createhd --filename %s --size %s" % (self.DISK_FILE, self.DISK_SIZE))
-        if self.vboxversion == (4,0) or self.vboxversion == (4,1) or self.vboxversion == (4,2):
-            self.run("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium none" % self.VBOX_NAME)
+            self.run_or_die("VBoxManage createhd --filename %s --size %s"
+                            % (self.DISK_FILE, self.DISK_SIZE))
+        if self.vboxversion == (4, 0) or self.vboxversion == (4, 1) \
+                or self.vboxversion == (4, 2):
+            self.run(
+                "VBoxManage storageattach %s --storagectl \"IDE Controller\"",
+                "--port 0 --device 0 --type hdd --medium none"
+                % self.VBOX_NAME)
             if self.PATH_TO_ISO != "/dev/null":
-                self.run("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium none" % self.VBOX_NAME)
+                self.run("VBoxManage storageattach %s --storagectl \"IDE "
+                         "Controller\" --port 0 --device 1 --type dvddrive "
+                         "--medium none" % self.VBOX_NAME)
         #info("Creating the Virtual Machine...")
         logger.info("Creating the Virtual Machine...")
-        if os.path.exists("%s/.VirtualBox/Machines/%s/%s.xml" % (self.HOME, self.VBOX_NAME, self.VBOX_NAME)):
-            os.unlink("%s/.VirtualBox/Machines/%s/%s.xml" % (self.HOME, self.VBOX_NAME, self.VBOX_NAME))
+        if os.path.exists("%s/.VirtualBox/Machines/%s/%s.xml" % (
+           self.HOME, self.VBOX_NAME, self.VBOX_NAME)):
+            os.unlink("%s/.VirtualBox/Machines/%s/%s.xml" % (
+                self.HOME, self.VBOX_NAME, self.VBOX_NAME))
         self.run("VBoxManage unregistervm %s --delete" % self.VBOX_NAME)
-        self.run_or_die("VBoxManage createvm --register --name %s" % self.VBOX_NAME)
-        self.run_or_die("VBoxManage modifyvm %s --memory %s" % (self.VBOX_NAME, self.MEM))
+        self.run_or_die("VBoxManage createvm --register --name %s"
+                        % self.VBOX_NAME)
+        self.run_or_die("VBoxManage modifyvm %s --memory %s"
+                        % (self.VBOX_NAME, self.MEM))
         # This should probably support more than just Ubuntu...
         if self.ISO_URL.find("amd64") >= 0:
             platform = "Ubuntu_64"
         else:
             platform = "Ubuntu"
-        self.run_or_die("VBoxManage modifyvm %s --ostype %s" % (self.VBOX_NAME, platform))
+        self.run_or_die("VBoxManage modifyvm %s --ostype %s"
+                        % (self.VBOX_NAME, platform))
         self.run_or_die("VBoxManage modifyvm %s --vram 128" % self.VBOX_NAME)
         self.run_or_die("VBoxManage modifyvm %s --boot1 disk" % self.VBOX_NAME)
         self.run_or_die("VBoxManage modifyvm %s --boot2 dvd" % self.VBOX_NAME)
         self.run_or_die("VBoxManage modifyvm %s --nic1 nat" % self.VBOX_NAME)
-   	self.run_or_die("VBoxManage modifyvm %s --pae on" % self.VBOX_NAME)
+        self.run_or_die("VBoxManage modifyvm %s --pae on" % self.VBOX_NAME)
 
     # Code launch virtual machine
     def launch_virt(self):
         logger.info("Running the Virtual Machine...")
-        if self.vboxversion == (4,0) or self.vboxversion == (4,1) or self.vboxversion == (4,2):
-            self.run_or_die("VBoxManage storagectl %s --name \"IDE Controller\" --add ide" % self.VBOX_NAME)
-            self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 0 --type hdd --medium %s" % (self.VBOX_NAME, self.DISK_FILE))
+        if self.vboxversion == (4, 0) or self.vboxversion == (4, 1) \
+           or self.vboxversion == (4, 2):
+            self.run_or_die("VBoxManage storagectl %s --name \"IDE",
+                            "Controller\" --add ide" % self.VBOX_NAME)
+            self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE",
+                            "Controller\" --port 0 --device 0 --type hdd",
+                            "--medium %s" % (self.VBOX_NAME, self.DISK_FILE))
             if self.PATH_TO_ISO != "/dev/null":
-                self.run_or_die("VBoxManage storageattach %s --storagectl \"IDE Controller\" --port 0 --device 1 --type dvddrive --medium %s" % (self.VBOX_NAME, self.PATH_TO_ISO))
+                self.run_or_die(
+                    "VBoxManage storageattach %s --storagectl \"IDE",
+                    "Controller\"--port 0 --device 1 --type dvddrive",
+                    "--medium %s" % (self.VBOX_NAME, self.PATH_TO_ISO))
             #self.run_or_die("VBoxManage startvm %s" % self.td.VBOX_NAME)
             return "VBoxManage startvm %s" % self.VBOX_NAME
 
         # Give this VM a few seconds to start up
         #time.sleep(5)
         # Loop as long as this VM is running
-        #while commands.getstatusoutput("VBoxManage list runningvms | grep -qs %s" % self.td.VBOX_NAME)[0] == 0:
+        #while commands.getstatusoutput("VBoxManage list runningvms | \
+        # grep -qs %s" % self.td.VBOX_NAME)[0] == 0:
         #   time.sleep(2)
 
     def run(self, cmd):
 
=== modified file 'testdrivegtk/AboutTestdrivegtkDialog.py'
--- testdrivegtk/AboutTestdrivegtkDialog.py	2012-05-15 20:43:24 +0000
+++ testdrivegtk/AboutTestdrivegtkDialog.py	2013-10-06 20:59:44 +0000
@@ -1,20 +1,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -23,14 +23,16 @@
 from testdrivegtk.helpers import get_builder
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
 import commands
-version = commands.getstatusoutput("dpkg -l testdrive-gtk | tail -n1 | awk '{print $3}'")
+version = commands.getstatusoutput(
+    "dpkg -l testdrive-gtk | tail -n1 | awk '{print $3}'")
 
 __version__ = version[1].split("-0")[0]
-__licensenotice__ = 'This program is free software: you can redistribute it and/or modify\n\
+__licensenotice__ = """
+'This program is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
 the Free Software Foundation, either version 3 of the License, or\n\
 (at your option) any later version.\n\
@@ -41,17 +43,18 @@
 GNU General Public License for more details.\n\
 \n\
 You should have received a copy of the GNU General Public License\n\
-along with this program.  If not, see <http://www.gnu.org/licenses/>.'
+along with this program.  If not, see <http://www.gnu.org/licenses/>. """
 __authors__ = ['Andres Rodriguez <[e-mail]>']
-__description__ = 'PyGTK Front-end for TestDrive'
+__description__ = _('PyGTK Front-end for TestDrive')
 __website__ = "https://launchpad.net/testdrive"
 __copyright__ = "Copyright © 2010 - 2012 Canonical Ltd."
 
+
 class AboutTestdrivegtkDialog(gtk.AboutDialog):
     __gtype_name__ = "AboutTestdrivegtkDialog"
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
 
         Returns a fully instantiated AboutTestdrivegtkDialog object.
@@ -77,7 +80,7 @@
 
         # Code for other initialization actions should be added here.
         dialog = builder.get_object("about_testdrivegtk_dialog")
-        
+
         dialog.set_version(__version__)
         dialog.set_authors(__authors__)
         dialog.set_comments(__description__)
 
=== modified file 'testdrivegtk/AddOtherTestdrivegtkDialog.py'
--- testdrivegtk/AddOtherTestdrivegtkDialog.py	2012-04-21 02:05:42 +0000
+++ testdrivegtk/AddOtherTestdrivegtkDialog.py	2013-10-06 20:59:44 +0000
@@ -6,17 +6,20 @@
 import gtk
 
 from testdrivegtk.helpers import get_builder
-import os, string, commands
+import os
+import string
+import commands
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
+
 class AddOtherTestdrivegtkDialog(gtk.Dialog):
     __gtype_name__ = "AddothertestdrivegtkDialog"
 
     def __new__(cls, cache):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
 
         Returns a fully instantiated AddothertestdrivegtkDialog object.
@@ -57,7 +60,7 @@
         # Saving changes in the isos file
         path = "%s/other.isos" % self.CACHE
         try:
-            f = open(path,'w')
+            f = open(path, 'w')
             for item in self.liststore:
                 iso = "other\tother\t\t%s\t\t%s\n" % (item[2], item[1])
                 f.write(iso)
@@ -83,15 +86,17 @@
             self.PROTO = None
 
     def on_error_dlg(self, data=None):
-        errorbox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, 
+        errorbox = gtk.MessageDialog(
+            self,
+            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR,
             gtk.BUTTONS_CLOSE, data)
         response = errorbox.run()
         errorbox.destroy()
 
     def on_info_dlg(self, data=None):
-        errorbox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO, 
+        errorbox = gtk.MessageDialog(
+            self,
+            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO,
             gtk.BUTTONS_CLOSE, data)
         errorbox.run()
         errorbox.destroy()
@@ -116,7 +121,7 @@
         self.cb_sync_proto.set_active(0)
 
     def on_btn_del_iso_clicked(self, widget):
-        # When Delete button is clicked, deletes it from the list store, 
+        # When Delete button is clicked, deletes it from the list store,
         # but changes are not saved
         selection = self.treeview.get_selection()
         model, iter = selection.get_selected()
@@ -129,7 +134,7 @@
         ###### Validating that the input URL si correct and exists #######
         ##################################################################
         file = self.txt_other_url.get_text().strip()
-        desc = self.txt_other_desc.get_text().replace(' ','-')
+        desc = self.txt_other_desc.get_text().replace(' ', '-')
 
         if len(desc) == 0:
             self.on_error_dlg(_("Please insert a Description"))
@@ -147,9 +152,10 @@
             if string.find(file, "%s://" % i) == 0:
                 self.url = file
         #If it's a local path, test it for viability
-        if commands.getstatusoutput("file \"%s\" | grep -qs \"ISO 9660\"" % file)[0] == 0:
+        if commands.getstatusoutput("file \"%s\" | grep -qs \"ISO 9660\""
+                                    % file)[0] == 0:
             #return("file://%s" % file)
-            self.url ="file://%s" % file
+            self.url = "file://%s" % file
 
         if self.url is None:
             self.on_error_dlg(_("Invalid ISO URL [%s]") % file)
@@ -163,12 +169,14 @@
             url = url.replace(proto, 'http')
         if proto == 'file':
             pass
-        elif os.system("wget --spider -S %s 2>&1 | grep 'HTTP/1.. 200 OK'" % url) != 0:
+        elif os.system("wget --spider -S %s 2>&1 | grep 'HTTP/1.. 200 OK'"
+                       % url) != 0:
             self.on_error_dlg(_("ISO not found at [%s]") % url)
-            return False    
+            return False
 
         if self.PROTO is None:
-            self.on_error_dlg(_("No sync protocol has been selected, please select one."))
+            self.on_error_dlg(_("No sync protocol has been selected, "
+                                "please select one."))
             return False
         else:
             return True
@@ -205,9 +213,11 @@
             if n >= 1:
                 self.treeview.columns[n].cell.set_property('editable', True)
             # add the cells to the columns
-            self.treeview.columns[n].pack_start(self.treeview.columns[n].cell, True)
+            self.treeview.columns[n].pack_start(
+                self.treeview.columns[n].cell, True)
             # set the cell attributes to the appropriate liststore column
-            self.treeview.columns[n].set_attributes(self.treeview.columns[n].cell, text=n)
+            self.treeview.columns[n].set_attributes(
+                self.treeview.columns[n].cell, text=n)
 
         self.btn_add_other = self.builder.get_object("btn_add_iso")
         self.btn_add_other.connect("clicked", self.on_btn_add_iso_clicked)
@@ -217,7 +227,8 @@
 
         # Expander
         self.ex_other_iso_list = self.builder.get_object("ex_other_iso_list")
-        self.ex_other_iso_list.connect('notify::expanded', self.on_iso_list_expanded)
+        self.ex_other_iso_list.connect(
+            'notify::expanded', self.on_iso_list_expanded)
         self.scroll_iso_list = self.builder.get_object("scrolledwindow1")
         self.ex_other_iso_list.remove(self.ex_other_iso_list.child)
 
@@ -232,7 +243,8 @@
         self.cb_sync_proto.connect('changed', self.on_select_sync_proto)
         self.cb_sync_proto.set_active(0)
         self.cb_sync_proto.show()
-        self.layout_table.attach(self.cb_sync_proto, 1,3,2,3, gtk.FILL | gtk.EXPAND, gtk.SHRINK)
+        self.layout_table.attach(
+            self.cb_sync_proto, 1, 3, 2, 3, gtk.FILL | gtk.EXPAND, gtk.SHRINK)
 
     def get_other_isos_list_from_cache(self):
         ##################################################################
 
=== modified file 'testdrivegtk/PreferencesTestdrivegtkDialog.py'
--- testdrivegtk/PreferencesTestdrivegtkDialog.py	2013-08-10 21:31:38 +0000
+++ testdrivegtk/PreferencesTestdrivegtkDialog.py	2013-10-06 20:59:44 +0000
@@ -1,20 +1,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -29,19 +29,20 @@
 from testdrivegtk.helpers import get_builder
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
 ISO_REPOSITORY = ['cdimage', 'releases']
-MEM_SIZE_TAB = ['256', '384', '512', '1024', '2048',_('Other...')]
-DISK_SIZE_TAB = ['4', '6', '8', '10', '16',_('Other...')]
+MEM_SIZE_TAB = ['256', '384', '512', '1024', '2048', _('Other...')]
+DISK_SIZE_TAB = ['4', '6', '8', '10', '16', _('Other...')]
+
 
 class PreferencesTestdrivegtkDialog(gtk.Dialog):
     __gtype_name__ = "PreferencesTestdrivegtkDialog"
     preferences = {}
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
 
         Returns a fully instantiated PreferencesTestdrivegtkDialog object.
@@ -96,7 +97,7 @@
         self.initialize_widgets()
         self.initialize_widgets_values()
         self.logger.debug(_('finish_initialization()'))
-        
+
         self.builder.get_object("txt_gral_cache")
 
     def initialize_variables(self):
@@ -119,11 +120,15 @@
         self.txt_iso_list_cache = self.builder.get_object("txt_iso_list_cache")
         # Clean Ups
         self.btn_iso_clean = self.builder.get_object("btn_iso_clean")
-        self.btn_iso_clean.connect("clicked", self.on_cache_cleanup_clicked, self.td.CACHE_ISO)
+        self.btn_iso_clean.connect(
+            "clicked", self.on_cache_cleanup_clicked, self.td.CACHE_ISO)
         self.btn_img_clean = self.builder.get_object("btn_img_clean")
-        self.btn_img_clean.connect("clicked", self.on_cache_cleanup_clicked, self.td.CACHE_IMG)
-        self.btn_update_iso_list_cache = self.builder.get_object("btn_update_iso_list_cache")
-        self.btn_update_iso_list_cache.connect("clicked", self.on_force_iso_list_update)
+        self.btn_img_clean.connect(
+            "clicked", self.on_cache_cleanup_clicked, self.td.CACHE_IMG)
+        self.btn_update_iso_list_cache = self.builder.get_object(
+            "btn_update_iso_list_cache")
+        self.btn_update_iso_list_cache.connect(
+            "clicked", self.on_force_iso_list_update)
 
         # Ubuntu Releases
         self.chk_arch_i386 = self.builder.get_object("chk_arch_i386")
@@ -136,33 +141,37 @@
         self.cb_ubuntu_repo = gtk.combo_box_new_text()
         self.cb_ubuntu_repo.set_size_request(260, -1)
         self.cb_ubuntu_repo.append_text(_('Select Repository:'))
-        for repo in ISO_REPOSITORY:     
+        for repo in ISO_REPOSITORY:
             self.cb_ubuntu_repo.append_text(repo)
         self.cb_ubuntu_repo.connect('changed', self.on_select_iso_image_repo)
         self.cb_ubuntu_repo.set_active(0)
         self.cb_ubuntu_repo.show()
-        self.tb_general_prefs.attach(self.cb_ubuntu_repo, 1,2,7,8)
+        self.tb_general_prefs.attach(self.cb_ubuntu_repo, 1, 2, 7, 8)
         # Ubuntu Releases Combo Box
         self.cb_ubuntu_release = gtk.combo_box_new_text()
         self.cb_ubuntu_release.set_size_request(260, -1)
-        self.cb_ubuntu_release.connect('changed', self.on_select_ubuntu_release)
+        self.cb_ubuntu_release.connect(
+            'changed', self.on_select_ubuntu_release)
         self.cb_ubuntu_release.append_text(_('Select Release:'))
         self.cb_ubuntu_release.set_active(0)
         self.cb_ubuntu_release.show()
-        self.tb_general_prefs.attach(self.cb_ubuntu_release, 1,2,8,9)
-        
+        self.tb_general_prefs.attach(self.cb_ubuntu_release, 1, 2, 8, 9)
+
         # Initialize Virtualization Method Options
         self.opt_virt_kvm = self.builder.get_object("opt_virt_kvm")
-        self.opt_virt_kvm.connect("toggled", self.on_select_virt_method, "kvm")
+        self.opt_virt_kvm.connect(
+            "toggled", self.on_select_virt_method, "kvm")
         self.opt_virt_vbox = self.builder.get_object("opt_virt_vbox")
-        self.opt_virt_vbox.connect("toggled", self.on_select_virt_method, "virtualbox")
+        self.opt_virt_vbox.connect(
+            "toggled", self.on_select_virt_method, "virtualbox")
         self.opt_virt_parallels = self.builder.get_object("opt_virt_parallels")
-        self.opt_virt_parallels.connect("toggled", self.on_select_virt_method, "parallels")
+        self.opt_virt_parallels.connect(
+            "toggled", self.on_select_virt_method, "parallels")
 
         # Initialize Memory Options
         self.cbe_mem_size = self.builder.get_object("cbe_mem_size")
         self.cbe_mem_size.remove_text(0)
-        for mem in MEM_SIZE_TAB:        
+        for mem in MEM_SIZE_TAB:
             self.cbe_mem_size.append_text(mem)
         self.cbe_mem_size.connect('changed', self.on_select_mem)
 
@@ -183,30 +192,42 @@
         self.lb_smp_available = self.builder.get_object("lb_smp_available")
 
         # Flavors
-        self.chk_flavor_ubuntu = self.builder.get_object("chk_flavor_ubuntu")
+        self.chk_flavor_ubuntu = self.builder.get_object(
+            "chk_flavor_ubuntu")
         self.chk_flavor_ubuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_kubuntu = self.builder.get_object("chk_flavor_kubuntu")
+        self.chk_flavor_kubuntu = self.builder.get_object(
+            "chk_flavor_kubuntu")
         self.chk_flavor_kubuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_xubuntu = self.builder.get_object("chk_flavor_xubuntu")
+        self.chk_flavor_xubuntu = self.builder.get_object(
+            "chk_flavor_xubuntu")
         self.chk_flavor_xubuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_edubuntu = self.builder.get_object("chk_flavor_edubuntu")
+        self.chk_flavor_edubuntu = self.builder.get_object(
+            "chk_flavor_edubuntu")
         self.chk_flavor_edubuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_mythbuntu = self.builder.get_object("chk_flavor_mythbuntu")
+        self.chk_flavor_mythbuntu = self.builder.get_object(
+            "chk_flavor_mythbuntu")
         self.chk_flavor_mythbuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_ubuntustudio = self.builder.get_object("chk_flavor_ubuntustudio")
+        self.chk_flavor_ubuntustudio = self.builder.get_object(
+            "chk_flavor_ubuntustudio")
         self.chk_flavor_ubuntustudio.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_lubuntu = self.builder.get_object("chk_flavor_lubuntu")
+        self.chk_flavor_lubuntu = self.builder.get_object(
+            "chk_flavor_lubuntu")
         self.chk_flavor_lubuntu.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_ubuntukylin = self.builder.get_object("chk_flavor_ubuntukylin")
+        self.chk_flavor_ubuntukylin = self.builder.get_object(
+            "chk_flavor_ubuntukylin")
         self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)
-        self.chk_flavor_other = self.builder.get_object("chk_flavor_other")
+        self.chk_flavor_other = self.builder.get_object(
+            "chk_flavor_other")
         self.chk_flavor_other.connect("clicked", self.on_select_flavors)
 
     def initialize_config_files(self):
         ##################################################################
         ########### Read the configuration file for settings #############
         ##################################################################
-        config_files = ["/etc/%s" % self.td.PKGRC, "%s/.%s" % (self.td.HOME, self.td.PKGRC), "%s/.config/%s/%s" % (self.td.HOME, self.td.PKG, self.td.PKGRC) ]
+        config_files = ["/etc/%s" % self.td.PKGRC,
+                        "%s/.%s" % (self.td.HOME, self.td.PKGRC),
+                        "%s/.config/%s/%s" % (self.td.HOME, self.td.PKG,
+                                              self.td.PKGRC)]
         for file in config_files:
             if os.path.exists(file):
                 try:
@@ -216,7 +237,8 @@
                     #self.load_config_files(file)
                     self.logger.debug(_("Reading config file: [%s]") % file)
                 except:
-                    self.logger.debug(_("Unable to load config file [%s]") % file)
+                    self.logger.debug(_(
+                        "Unable to load config file [%s]") % file)
                 #   return False
             #return True
 
@@ -275,11 +297,13 @@
 
         # KVM Args
         self.txt_kvm_args.set_text(self.td.KVM_ARGS)
-        
+
         # SMP
         if self.td.SMP:
             self.txt_smp_nbr.set_text(self.td.SMP)
-            self.lb_smp_available.set_text(_(" of %s available.") % commands.getoutput("grep -c ^processor /proc/cpuinfo"))
+            self.lb_smp_available.set_text(_(
+                " of %s available."
+                ) % commands.getoutput("grep -c ^processor /proc/cpuinfo"))
 
         # Flavors
         i = 0
@@ -318,29 +342,36 @@
             if arch == 'amd64':
                 self.chk_arch_amd64.set_active(True)
 
-    def update_iso_cache(self, force_update = False):
+    def update_iso_cache(self, force_update=False):
         ##################################################################
         ###### Code to update the ISO list from the repository Cache #####
         ##################################################################
         update_cache = None
         cdimage = False
-        """ Verify if the ISO list is cached, if not, set variable to update/create it. """
+        """ Verify if the ISO list is cached, if not,
+            set variable to update/create it. """
         if force_update is True:
             update_cache = 1
             pass
         elif self.td.is_iso_list_cached() is False:
             update_cache = 1
-        # If ISO list is cached, verify if it is expired. If it is, set variable to update it.
+        # If ISO list is cached, verify if it is expired.
+        # If it is, set variable to update it.
         elif self.td.is_iso_list_cache_expired() is True:
             update_cache = 1
 
-        """ If variable set to update, obtain the ISO list from the Ubuntu CD Image repository. """
+        """ If variable set to update, obtain the ISO
+        list from the Ubuntu CD Image repository. """
         if update_cache == 1:
-            self.logger.info(_("Obtaining Ubuntu ISO list from %s...") % self.td.u)
+            self.logger.info(_("""
+                Obtaining Ubuntu ISO list from %s...
+                """) % self.td.u)
             try:
                 cdimage = self.td.obtain_ubuntu_iso_list_from_repo()
             except:
-                self.logger.error(_("Could not obtain the Ubuntu ISO list from %s...") % self.td.u)
+                self.logger.error(_("""
+                     Could not obtain the Ubuntu ISO list from %s...
+                     """) % self.td.u)
 
         """ If the ISO List was obtained, update the cache file"""
         if cdimage:
@@ -348,7 +379,9 @@
             try:
                 self.td.update_ubuntu_iso_list_cache(cdimage)
             except:
-                self.logger.error(_("Unable to update the Ubuntu ISO list cache..."))
+                self.logger.error(_("""
+                    Unable to update the Ubuntu ISO list cache...
+                    """))
 
     def get_preferences(self):
         """Returns preferences for testdrivegtk."""
@@ -393,8 +426,9 @@
         pass
 
     def on_error_dlg(self, data=None):
-        errorbox = gtk.MessageDialog(self, 
-            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, 
+        errorbox = gtk.MessageDialog(
+            self,
+            gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR,
             gtk.BUTTONS_CLOSE, data)
         response = errorbox.run()
         errorbox.destroy()
@@ -452,9 +486,9 @@
 
     def on_select_arch(self, widget, arch):
         # On selecting the architecture
-        if widget.get_active() == True:
+        if widget.get_active():
             self.arch.append(arch)
-        if widget.get_active() == False:
+        if not widget.get_active():
             self.arch.remove(arch)
 
     def on_txt_gral_cache_focus_out_event(self, widget, data=None):
@@ -476,7 +510,7 @@
                 os.unlink(path)
         except:
             on_error_dlg(_("Unable to clean up files from [%s]") % cache_path)
-    
+
     def on_select_iso_image_repo(self, widget):
         ##################################################################
         #### Select image repo, populate Release combobox accordingly ####
@@ -487,9 +521,11 @@
             old_repo = self.td.p
             self.repo = model[index][0]
             self.td.p = self.repo
-            self.txt_iso_list_cache.set_text("%s/%s.isos" % (self.td.CACHE, self.td.p))
+            self.txt_iso_list_cache.set_text("%s/%s.isos" %
+                                            (self.td.CACHE, self.td.p))
 
-            # Update cache commented given the hack to sync every repo on initialization
+            # Update cache commented given the
+            # hack to sync every repo on initialization
             #self.update_iso_cache()
             # Populate the releases combobox
             self.cb_ubuntu_release.get_model().clear()
@@ -536,30 +572,30 @@
         ##################################################################
         self.preferences = []
         # CACHE Variables
-        if self.txt_gral_cache.get_text() != None:
+        if self.txt_gral_cache.get_text() is not None:
             self.td.CACHE = self.txt_gral_cache.get_text()
             self.preferences.append(['cache', self.td.CACHE])
-        if self.txt_img_cache.get_text() != None:
+        if self.txt_img_cache.get_text() is not None:
             self.td.CACHE_IMG = self.txt_img_cache.get_text()
             self.preferences.append(['cache_img', self.td.CACHE_IMG])
-        if self.txt_iso_cache.get_text() != None:
+        if self.txt_iso_cache.get_text() is not None:
             self.td.CACHE_ISO = self.txt_iso_cache.get_text()
             self.preferences.append(['cache_iso', self.td.CACHE_ISO])
 
         # Repo selection
-        if self.repo != None:
+        if self.repo is not None:
             self.preferences.append(['p', self.td.p])
 
-        if self.r != None:
+        if self.r is not None:
             self.td.r = self.r
             self.preferences.append(['r', self.td.r])
 
         # KVM Args
-        if self.txt_kvm_args.get_text() != None:
+        if self.txt_kvm_args.get_text() is not None:
             self.td.KVM_ARGS = self.txt_kvm_args.get_text()
             self.preferences.append(['kvm_args', self.td.KVM_ARGS])
 
-        if self.txt_smp_nbr.get_text() != None:
+        if self.txt_smp_nbr.get_text() is not None:
             self.td.SMP = self.txt_smp_nbr.get_text()
             self.preferences.append(['smp', self.td.SMP])
 
@@ -573,21 +609,21 @@
             self.preferences.append(['m', self.td.m[0]])
 
         # VIRT Methods
-        if self.virt_method != None:
+        if self.virt_method is not None:
             self.td.VIRT = self.virt_method
             self.preferences.append(['virt', self.td.VIRT])
 
         # Memory - TODO: Add validation of text
         if self.mem == 'other':
             self.mem = self.cbe_mem_size.child.get_text()
-        if self.mem != None or self.mem not in MEM_SIZE_TAB:
+        if self.mem is not None or self.mem not in MEM_SIZE_TAB:
             self.td.MEM = self.mem
             self.preferences.append(['mem', self.td.MEM])
 
         # Disk Size - TODO: Add validation of text
         if self.disk_size == 'other':
             self.disk_size = self.cbe_disk_size.child.get_text()
-        if self.disk_size != None or self.disk_size not in DISK_SIZE_TAB:
+        if self.disk_size is not None or self.disk_size not in DISK_SIZE_TAB:
             self.td.DISK_SIZE = "%sG" % self.disk_size
             self.preferences.append(['disk_size', self.td.DISK_SIZE])
 
 
=== modified file 'testdrivegtk/helpers.py'
--- testdrivegtk/helpers.py	2012-04-21 02:05:42 +0000
+++ testdrivegtk/helpers.py	2013-10-06 20:59:44 +0000
@@ -1,20 +1,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -30,11 +30,12 @@
 from testdrivegtk.testdrivegtkconfig import get_data_file
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
+
 def get_builder(builder_file_name):
-    """Return a fully-instantiated gtk.Builder instance from specified ui 
+    """Return a fully-instantiated gtk.Builder instance from specified ui
     file
 
     :param builder_file_name: The name of the builder file, without extension.
 
=== modified file 'testdrivegtk/testdrivegtkconfig.py'
--- testdrivegtk/testdrivegtkconfig.py	2012-04-21 02:05:42 +0000
+++ testdrivegtk/testdrivegtkconfig.py	2013-10-06 20:59:44 +0000
@@ -1,20 +1,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Canonical Ltd.
-# 
+#
 # Authors:
 #   Andres Rodriguez <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -37,9 +37,10 @@
 import os
 
 import gettext
-from gettext import gettext as _
+_ = gettext.gettext
 gettext.textdomain('testdrive')
 
+
 class project_path_not_found(Exception):
     """Raised when we can't find the project directory."""