Merge lp:~barry/window-mocker/py3qt5 into lp:window-mocker

[Barry Warsaw]

Now with cgoldberg's branch landed, this is rebased on trunk, and cleans up a few ancillary things.

window-mocker (1.4-0ubuntu1) UNRELEASED; urgency=medium

  * Bump revision to 1.4.
  * Add MANIFEST.in to prune build artifacts from tarball.
  * Clean ups:
    + White space.
    + Use of insecure tempfile.mktemp()
    + Use of non-temporary file names.
    + Use of mutable default arguments.
    + Improve Python 2/3 compatibility.
  * d/control:
    + Add dependency on python{,3}-six for Python 3 compatibility fix.
    + Remove dependency on python3-mock (use unittest.mock instead in Py3).
    + Bump Standards-Version to 3.9.5 with no other changes necessary.

 -- Barry Warsaw <email address hidden> Thu, 30 Jan 2014 13:48:47 +0000

[Corey Goldberg (coreygoldberg)]

Hi Barry,
I have a pending py3 branch also. Mine is Python 2/3 compatible and can select PyQt4 or PyQt5 in the python3 version.
The reason it has yet to be merged is because of a bug in PyQt5 causing a segfault:

the bug is here:
https://bugs.launchpad.net/window-mocker/+bug/1273306

my branch is here:
https://code.launchpad.net/~coreygoldberg/window-mocker/py3

-Corey

[Barry Warsaw (barry)]

Oops, sorry, that is the wrong branch. Let me try again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/window-mocker-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/window-mocker-ci/23/rebuild

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

Thanks Corey. Sorry for not seeing your mp first. I left a comment on yours:

https://code.launchpad.net/~coreygoldberg/window-mocker/py3/+merge/196978/comments/476977

tl;dr: window-mocker should be Python 3 only to eliminate the Python 2 dependencies. I'll leave the PyQt4/5 decisions to you guys, but it's pretty easy to switch between the two (I could make it easier yet by fiddling with the imports), as long as you don't need to speak both versions. Maybe supporting both makes transition easier?

[Barry Warsaw (barry)]

FWIW, I think this is blocking my autopilot reexec branch:

https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2434/console

so it would be good to resolve the issue and get this landed asap. Is there anything I can do to help move it along?

[Barry Warsaw (barry)]

After chatting w/thomi on IRC, it sounds like cgoldberg's branch is more aligned with the immediate needs, and thomi has reviewed it and says it looks good. WFM! Landing cgoldberg's branch will unblock my autopilot work, so let's do that asap, and if anything more is needed later, we can handle that.

It does mean we'll carry Python 2 stuff around for now, but that's just cruft that will eventually bitrot in the archive or get cleaned up later.

One note: we found one place in the unity7 test suite that imports windowmocker. It does it for silly reasons though afaict (since it only does it to see if window-mocker is available, but that could easily be done in other ways). AFAICT, windowmocker the module is never used outside of /usr/bin/window-mocker*, except for this one case of unity7, which should be easy to fix.

Or do you know of anything else that imports windowmocker?

[lp:~barry/window-mocker/py3qt5]

42. By Barry Warsaw on 2014-02-05

Revert a few previous changes. Fix some typos.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/window-mocker-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-trusty-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/window-mocker-ci/24/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-02-05 16:22:14 +0000
@@ -0,0 +1,2 @@
+__pycache__
+*.egg-info

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2014-02-05 16:22:14 +0000
@@ -0,0 +1,2 @@
+prune debian
+prune dist

=== modified file 'bin/window-mocker'
--- bin/window-mocker	2014-01-21 20:26:48 +0000
+++ bin/window-mocker	2014-02-05 16:22:14 +0000
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -11,8 +11,10 @@
 import argparse
 import sys
 
-from windowmocker import create_application_from_path, create_application_from_data
-from windowmocker.plugins import get_default_plugin_name, get_registered_plugin_names
+from windowmocker import (
+    create_application_from_path, create_application_from_data)
+from windowmocker.plugins import (
+    get_default_plugin_name, get_registered_plugin_names)
 
 
 def main():

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 07:08:45 +0000
+++ debian/changelog	2014-02-05 16:22:14 +0000
@@ -1,3 +1,20 @@
+window-mocker (1.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Bump revision to 1.4.
+  * Add MANIFEST.in to prune build artifacts from tarball.
+  * Clean ups:
+    + White space.
+    + Use of insecure tempfile.mktemp()
+    + Use of non-temporary file names.
+    + Use of mutable default arguments.
+    + Improve Python 2/3 compatibility.
+  * d/control:
+    + Add dependency on python{,3}-six for Python 3 compatibility fix.
+    + Remove dependency on python3-mock (use unittest.mock instead in Py3).
+    + Bump Standards-Version to 3.9.5 with no other changes necessary.
+
+ -- Barry Warsaw <[e-mail]>  Thu, 30 Jan 2014 13:48:47 +0000
+
 window-mocker (1.3daily13.06.05-0ubuntu1) saucy; urgency=low
 
   [ Thomi Richards ]

=== modified file 'debian/control'
--- debian/control	2014-01-09 17:27:37 +0000
+++ debian/control	2014-02-05 16:22:14 +0000
@@ -9,15 +9,16 @@
                python-mock,
                python-qt4,
                python-setuptools,
+               python-six,
                python-testscenarios,
-               python3,
+               python3-all,
                python3-distutils-extra,
-               python3-mock,
                python3-pyqt4,
                python3-pyqt5,
                python3-setuptools,
+               python3-six,
                python3-testscenarios,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 # If you aren't a member of ~autopilot but need to upload packaging changes,
 # just go ahead.  ~autopilot will notice and sync up the code again.
 Vcs-Bzr: http://bazaar.launchpad.net/~autopilot/window-mocker/trunk
@@ -29,6 +30,7 @@
 Depends: ${misc:Depends},
          ${python:Depends},
          python-qt4,
+         python-six,
 Provides: ${python:Provides},
 Description: create windows and applications from specifications
  Window Mocker is a simple tool that allows developers to create windows and
@@ -42,10 +44,10 @@
          ${python:Depends},
          python3-pyqt4,
          python3-pyqt5,
+         python3-six,
 Provides: ${python:Provides},
 Description: create windows and applications from specifications
  Window Mocker is a simple tool that allows developers to create windows and
  applications that follow a certain specification. This is especially useful
  when testing applications that interact with other windows (like a window
  manager, for example).
-

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-07 16:41:10 +0000
+++ debian/copyright	2014-02-05 16:22:14 +0000
@@ -2,7 +2,7 @@
 Source: http://launchpad.net/window-mocker
 
 Files: *
-Copyright: 2012 Canonical, Ltd.
+Copyright: 2012-2014 Canonical, Ltd.
 License: GPL-3
 
 License: GPL-3

=== modified file 'debian/rules'
--- debian/rules	2014-01-17 22:31:40 +0000
+++ debian/rules	2014-02-05 16:22:14 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+#export DH_VERBOSE=1
 export PYBUILD_NAME=windowmocker
 
 %:

=== modified file 'setup.py'
--- setup.py	2014-01-08 20:35:14 +0000
+++ setup.py	2014-02-05 16:22:14 +0000
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012, 2013 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
 
 DistUtilsExtra.auto.setup(
     name='window-mocker',
-    version='1.3',
+    version='1.4',
     description=open('README').read(),
     author='Thomi Richards',
     author_email='[e-mail]',

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2012-09-18 03:20:19 +0000
+++ tests/__init__.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it

=== modified file 'tests/test_app_functional.py'
--- tests/test_app_functional.py	2014-01-21 20:56:11 +0000
+++ tests/test_app_functional.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012, 2013 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -8,10 +8,10 @@
 
 """Functional tests for the window-mocker application."""
 
-import os.path
+import os
 import subprocess
-import sys
 import tempfile
+
 from time import sleep
 
 from testtools import TestCase
@@ -34,7 +34,8 @@
     if os.path.exists(source_path):
         return source_path
 
-    return subprocess.check_output(['which', 'window-mocker'])
+    return subprocess.check_output(['which', 'window-mocker'],
+                                   universal_newlines=True)
 
 
 def run_app_with_args(*args):
@@ -51,7 +52,8 @@
             application,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            shell=False
+            shell=False,
+            universal_newlines=True,
             )
 
     stdout = stderr = ""
@@ -63,7 +65,7 @@
             print("Killing process.")
             process.kill()
         if i == 8:
-            print ("Terminating process.")
+            print("Terminating process.")
             process.terminate()
         sleep(1)
     stdout, stderr = process.communicate()
@@ -75,41 +77,43 @@
     """Functional tests for the window-mocker application."""
 
     def run_with_spec_content(self, content_string):
-        temp_filename = tempfile.mktemp()
+        fd, temp_filename = tempfile.mkstemp()
+        self.addCleanup(os.remove, temp_filename)
+        os.close(fd)
         with open(temp_filename, 'w') as f:
             f.write(content_string)
-        self.addCleanup(os.remove, temp_filename)
         return run_app_with_args(temp_filename)
 
     def test_errors_with_missing_file(self):
         retcode, stdout, stderr = run_app_with_args("bad_file_name")
-        self.assertThat(stdout, Equals(b''))
-        self.assertThat(stderr, Equals(b'Error: Unable to open file: No such file or directory\n'))
+        self.assertThat(stdout, Equals(''))
+        self.assertThat(stderr, Equals('Error: Unable to open file: No such file or directory\n'))
         self.assertThat(retcode, Equals(1))
 
     def test_errors_with_inaccessible_file(self):
-        file_name = 'cannot_read'
-        with open(file_name, 'w') as f:
-            os.chmod(file_name, 0)
-        self.addCleanup(os.remove, file_name)
+        fd, temp_filename = tempfile.mkstemp()
+        self.addCleanup(os.remove, temp_filename)
+        os.close(fd)
+        with open(temp_filename, 'w'):
+            pass
+        os.chmod(temp_filename, 0)
 
-        retcode, stdout, stderr = run_app_with_args("cannot_read")
-        self.assertThat(stdout, Equals(b''))
-        self.assertThat(stderr, Equals(b'Error: Unable to open file: Permission denied\n'))
+        retcode, stdout, stderr = run_app_with_args(temp_filename)
+        self.assertThat(stdout, Equals(''))
+        self.assertThat(stderr, Equals('Error: Unable to open file: Permission denied\n'))
         self.assertThat(retcode, Equals(1))
 
     def test_errors_on_empty_file(self):
         retcode, stdout, stderr = self.run_with_spec_content("")
 
-        self.assertThat(stdout, Equals(b''))
+        self.assertThat(stdout, Equals(''))
         self.assertThat(retcode, Equals(3))
-        self.assertThat(stderr, Equals(b'Error: Unable to process request: No JSON object could be decoded\n'))
+        self.assertThat(stderr, Equals('Error: Unable to process request: No JSON object could be decoded\n'))
 
     def test_accepts_testability_command_line_argument(self):
         retcode, stdout, stderr = run_app_with_args("--help")
-        self.assertThat(stdout.decode('utf-8'), Contains("-testability"))
+        self.assertThat(stdout, Contains("-testability"))
 
     def test_accepts_plugin_type_command_line_argument(self):
         retcode, stdout, stderr = run_app_with_args("--help")
-        output = stdout.decode('utf-8')
-        self.assertThat(stdout.decode('utf-8'), Contains("Qt4"))
+        self.assertThat(stdout, Contains("Qt4"))

=== modified file 'tests/test_plugins.py'
--- tests/test_plugins.py	2014-01-15 20:35:41 +0000
+++ tests/test_plugins.py	2014-02-05 16:22:14 +0000
@@ -1,22 +1,26 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # 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.
 
-from mock import patch
 from testscenarios import TestWithScenarios
 from testtools import TestCase
 from testtools.matchers import Contains, Equals, raises
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 from windowmocker.plugins import (
     base,
     get_plugin_by_name,
     register_plugin,
     register_named_plugin,
-    unregister_plugin_by_name 
+    unregister_plugin_by_name
     )
 
 class DummyAppPlugin(base.ApplicationTypePluginBase):
@@ -76,14 +80,16 @@
         DummyAppPlugin({})
 
         self.assertThat(mock_create_window.call_count, Equals(1))
-        self.assertThat(mock_create_window.call_args[0][0], Equals(DummyAppPlugin._window_default))
+        self.assertThat(mock_create_window.call_args[0][0],
+                        Equals(DummyAppPlugin._window_default))
 
     @patch.object(DummyAppPlugin, "create_window")
     def test_calls_create_window_with_defaults_added(self, mock_create_window):
         DummyAppPlugin({})
 
         self.assertThat(mock_create_window.call_count, Equals(1))
-        self.assertThat(mock_create_window.call_args[0][0], Equals(DummyAppPlugin._window_default))
+        self.assertThat(mock_create_window.call_args[0][0],
+                        Equals(DummyAppPlugin._window_default))
 
     @patch.object(DummyAppPlugin, "create_window")
     def test_passes_params_to_create_window(self, mock_create_window):
@@ -103,8 +109,10 @@
                 ])
 
         self.assertThat(mock_create_window.call_count, Equals(2))
-        self.assertThat(mock_create_window.call_args_list[0][0][0]["Title"], Equals("Window 1"))
-        self.assertThat(mock_create_window.call_args_list[1][0][0]["Title"], Equals("Window 2"))
+        self.assertThat(mock_create_window.call_args_list[0][0][0]["Title"],
+                        Equals("Window 1"))
+        self.assertThat(mock_create_window.call_args_list[1][0][0]["Title"],
+                        Equals("Window 2"))
 
 
 class PluginWindowDefaultParameterTests(TestWithScenarios, TestCase):
@@ -112,10 +120,12 @@
     """Tests for various default values for required parameters."""
 
     scenarios = [
-        ("Window Title", {'name': 'Title', 'expected': 'Default Window Title'}),
+        ("Window Title",
+            {'name': 'Title', 'expected': 'Default Window Title'}),
         ("Maximised", {'name': 'Maximized', 'expected': False}),
         ("Minimized", {'name': 'Minimized', 'expected': False}),
-        ("MinimizeImmediatelyAfterShow", {'name': 'MinimizeImmediatelyAfterShow', 'expected': False}),
+        ("MinimizeImmediatelyAfterShow",
+            {'name': 'MinimizeImmediatelyAfterShow', 'expected': False}),
         ("Menus", {'name': 'Menu', 'expected': []}),
         ]
 

=== renamed file 'tests/test_testapp_modlue_functions.py' => 'tests/test_testapp_module_functions.py'
--- tests/test_testapp_modlue_functions.py	2013-12-16 17:12:58 +0000
+++ tests/test_testapp_module_functions.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012, 2013 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -8,9 +8,15 @@
 
 
 import os
+import tempfile
+
 from io import StringIO
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 from testtools import TestCase
 from testtools.matchers import raises
 
@@ -25,19 +31,21 @@
         """create_application_from_path function must raise IOError when asked
         to open a file that does not exist.
         """
-        self.assertThat(lambda: windowmocker.create_application_from_path("_does_not_exist"),
-            raises(IOError))
+        self.assertThat(lambda: windowmocker.create_application_from_path("_does_not_exist"), raises(IOError))
 
-    def test_create_application_from_path_raises_IOError_on_bad_perms(self):
-        """create_application_from_path function must raise IOError when asked
-        to open a file that does not exist.
+    def test_create_application_from_path_raises_PermError_on_bad_perms(self):
+        """create_application_from_path function must raise PermissionError
+        when the file's permissions do not allow it to be read.
         """
-        file_name = '_bad_perms'
-        with open(file_name, 'w') as f:
-            os.chmod(file_name, 0)
-        self.addCleanup(os.remove, file_name)
+        fd, temp_filename = tempfile.mkstemp()
+        self.addCleanup(os.remove, temp_filename)
+        os.close(fd)
+        with open(temp_filename, 'w'):
+            pass
+        os.chmod(temp_filename, 0)
 
-        self.assertThat(lambda: windowmocker.create_application_from_path(file_name),
+        self.assertThat(
+            lambda: windowmocker.create_application_from_path(temp_filename),
             raises(IOError))
 
 
@@ -66,9 +74,15 @@
 
     @patch('windowmocker.create_application_from_data')
     def test_can_load_unicode_json(self, load_mock):
-        windowmocker.create_application_from_file(StringIO(u'["ɥǝןןo", "ʍoɹןp"]'))
-        load_mock.assert_called_once_with([u'\u0265\u01dd\u05df\u05dfo', u'\u028do\u0279\u05dfp'], None)
+        windowmocker.create_application_from_file(
+            StringIO(u'["ɥǝןןo", "ʍoɹןp"]'))
+        load_mock.assert_called_once_with(
+            [u'\u0265\u01dd\u05df\u05dfo', u'\u028do\u0279\u05dfp'], None)
 
     def test_raises_runtime_on_empty_file(self):
-        fn = lambda: windowmocker.create_application_from_file(StringIO())
-        self.assertThat(fn, raises(RuntimeError("No JSON object could be decoded")))
+        # BAW 2014-01-31: We cannot assert on the exact error message
+        # returned, because it's different between Python 3.3 and 3.4.
+        # http://bugs.python.org/issue20453
+        self.assertThat(
+            lambda: windowmocker.create_application_from_file(StringIO()),
+            raises(RuntimeError))

=== modified file 'windowmocker/__init__.py'
--- windowmocker/__init__.py	2014-01-07 20:05:34 +0000
+++ windowmocker/__init__.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -11,7 +11,7 @@
 import logging
 import os
 import subprocess
-from tempfile import mktemp
+import tempfile
 from threading import Thread
 
 
@@ -38,8 +38,8 @@
     not readable.
 
     """
-
-    return create_application_from_file(open(path, 'r'), app_type_name)
+    with open(path, 'r') as fp:
+        return create_application_from_file(fp, app_type_name)
 
 
 def create_application_from_file(file_object, app_type_name=None):
@@ -60,7 +60,7 @@
     return create_application_from_data(data, app_type_name)
 
 
-def create_application_from_data(data={}, app_type_name=None):
+def create_application_from_data(data=None, app_type_name=None):
     """Create an application object from 'data'.
 
     If data is None (the default), a default application is constructed.
@@ -72,7 +72,8 @@
     expected format.
 
     """
-
+    if data is None:
+        data = {}
     if type(data) not in (dict, list):
         raise RuntimeError(
             "Top-level data structure must be a dictionary or list, not %r" %
@@ -111,13 +112,14 @@
             (type(data).__name__))
 
     def run_thread():
-        file_path = mktemp()
-        with open(file_path, 'w') as f:
-            json.dump(data, f)
+        fd, temp_filename = tempfile.mkstemp()
+        os.close(fd)
         try:
-            subprocess.check_call(["window-mocker", file_path])
+            with open(temp_filename, 'w') as f:
+                json.dump(data, f)
+            subprocess.check_call(["window-mocker", temp_filename])
         finally:
-            os.remove(file_path)
+            os.remove(temp_filename)
 
     thread = Thread(target=run_thread)
     thread.start()

=== modified file 'windowmocker/plugins/__init__.py'
--- windowmocker/plugins/__init__.py	2014-01-21 20:56:11 +0000
+++ windowmocker/plugins/__init__.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
     if sys.version_info[0] < 3:
         del _plugin_registry['Qt5']
     return _plugin_registry.keys()
-        
+
 
 def register_named_plugin(plugin_name, plugin_class):
     global _plugin_registry
@@ -59,7 +59,7 @@
 
 def register_plugin(plugin_class):
     """Register plugin_class. Probably not ever needed, except by tests.
-    
+
     This function is deprecated and may be removed in a future release.
     Use `register_named_plugin` instead."""
     global _plugin_registry

=== modified file 'windowmocker/plugins/base.py'
--- windowmocker/plugins/base.py	2014-01-15 19:17:26 +0000
+++ windowmocker/plugins/base.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -33,10 +33,10 @@
         if not spec_dictionary:
             logger.warning("Specification contains no window specification. Creating a default window.")
 
-        if type(spec_dictionary) is dict:
+        if isinstance(spec_dictionary, dict):
             window_spec = self._create_window_spec(spec_dictionary)
             self.create_window(window_spec)
-        elif type(spec_dictionary) is list:
+        elif isinstance(spec_dictionary, list):
             for window in spec_dictionary:
                 window_spec = self._create_window_spec(window)
                 self.create_window(window_spec)
@@ -52,12 +52,15 @@
 
     def create_application(self):
         """Create an application."""
-        raise NotImplementedError("This method must be implemeneted by child classes.")
+        raise NotImplementedError(
+            "This method must be implemented by child classes.")
 
     def create_window(self, window_spec):
         """Create a window, according to 'window_spec'."""
-        raise NotImplementedError("This method must be implemeneted by child classes.")
+        raise NotImplementedError(
+            "This method must be implemented by child classes.")
 
     def run(self):
         """Enter the event loop - run the application & windows."""
-        raise NotImplementedError("This method must be implemeneted by child classes.")
+        raise NotImplementedError(
+            "This method must be implemented by child classes.")

=== modified file 'windowmocker/plugins/qt4.py'
--- windowmocker/plugins/qt4.py	2014-01-21 20:26:48 +0000
+++ windowmocker/plugins/qt4.py	2014-02-05 16:22:14 +0000
@@ -1,12 +1,11 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012, 2013 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 # Author: Thomi Richards
 #
 # 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.
 
-from __future__ import print_function
 import logging
 from PyQt4 import QtCore, QtGui
 import sys
@@ -47,8 +46,8 @@
         if not window_spec['Maximized'] and not window_spec['Minimized']:
             win.showNormal()
 
-        # In some cases, it's also needed to have the appliaction start normally
-        # but minimize itself right after starting
+        # In some cases, it's also needed to have the application start
+        # normally but minimize itself right after starting
         if window_spec['MinimizeImmediatelyAfterShow']:
             win.setWindowState(QtCore.Qt.WindowMinimized)
 
@@ -63,7 +62,7 @@
                 menu = parent.addMenu(title)
                 if 'Menu' in item:
                     self._create_menus(menu, item['Menu'])
-            elif isinstance(item, basestring):
+            elif isinstance(item, str):
                 parent.addAction(item)
             else:
                 logger.error("Invalid menu item - is not a dict or string: %r", item)

=== modified file 'windowmocker/plugins/qt5.py'
--- windowmocker/plugins/qt5.py	2014-01-21 17:30:10 +0000
+++ windowmocker/plugins/qt5.py	2014-02-05 16:22:14 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012, 2013 Canonical
+# Copyright 2012-2014 Canonical, Ltd.
 #
 # 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
@@ -8,11 +8,11 @@
 from __future__ import print_function
 import logging
 from PyQt5 import QtCore, QtWidgets
+import six
 import sys
 
 from windowmocker.plugins.base import ApplicationTypePluginBase
 
-
 logger = logging.getLogger(__name__)
 
 class QtPlugin(ApplicationTypePluginBase):
@@ -46,8 +46,8 @@
         if not window_spec['Maximized'] and not window_spec['Minimized']:
             win.showNormal()
 
-        # In some cases, it's also needed to have the appliaction start normally
-        # but minimize itself right after starting
+        # In some cases, it's also needed to have the application start
+        # normally but minimize itself right after starting
         if window_spec['MinimizeImmediatelyAfterShow']:
             win.setWindowState(QtCore.Qt.WindowMinimized)
 
@@ -62,7 +62,7 @@
                 menu = parent.addMenu(title)
                 if 'Menu' in item:
                     self._create_menus(menu, item['Menu'])
-            elif isinstance(item, basestring):
+            elif isinstance(item, six.string_types):
                 parent.addAction(item)
             else:
                 logger.error("Invalid menu item - is not a dict or string: %r", item)