Merge lp:~dobey/dirspec/python3 into lp:dirspec

[dobey]

Port to Python 3

As this adds python3 support, and runs the tests with python3, you'll also need python3-setuptools and python3-testtools installed. There's no python3-testtools in precise, so you'll need to install it from our nightlies PPA, to run the tests.

[lp:~dobey/dirspec/python3]

11. By dobey on 2012-07-13

Enforce use of bytes for all the paths

[Diego Sarmentero (diegosarmentero)]

+1 looks good and all the tests are ok

review: Approve

[lp:~dobey/dirspec/python3]

12. By dobey on 2012-07-13

Update the run-tests.bat to not use trial, and use setup.py build test clean

13. By dobey on 2012-07-13

Check for python3 existing before running the tests, for eg OS X

[Diego Sarmentero (diegosarmentero)]

======================================================================
FAIL: test_darwin_pkgd (dirspec.tests.test_utils.DarwinPkgdTestCase)
dirspec.tests.test_utils.DarwinPkgdTestCase.test_darwin_pkgd
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "x:\dirspec-dobye\dirspec\tests\test_utils.py", line 194, in test_darwin_pkgd
    self.assertEquals(path, expectedpath)
MismatchError: !=:
reference = u'x:\\dirspec-dobye\\dirspec\\utils.py\\Contents\\Resources\\Foo.app\\Contents\\MacOS\\foo'
actual = u'x:\\dirspec-dobye\\dirspec\\utils.py/Contents/Resources/Foo.app/Contents/MacOS/foo'

======================================================================
FAIL: test_linux_src_relative_path_exists (dirspec.tests.test_utils.PosixTestCase)
dirspec.tests.test_utils.PosixTestCase.test_linux_src_relative_path_exists
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "x:\dirspec-dobye\dirspec\tests\test_utils.py", line 250, in test_linux_src_relative_path_exists
    self.assertEquals(path, expectedpath)
MismatchError: u'/path/to/bin\\foo' != u'/path/to/bin/foo'

======================================================================
FAIL: test_unfrozen_dev_toplevel (dirspec.tests.test_utils.UnfrozenSrcTestCase)
dirspec.tests.test_utils.UnfrozenSrcTestCase.test_unfrozen_dev_toplevel
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "x:\dirspec-dobye\dirspec\tests\test_utils.py", line 164, in test_unfrozen_dev_toplevel
    self.assertEquals(path, "/path/to/bin/foo")
MismatchError: u'/path/to/bin\\foo' != u'/path/to/bin/foo'

----------------------------------------------------------------------
Ran 32 tests in 0.053s

FAILED (failures=3, skipped=2)

review: Needs Fixing

[lp:~dobey/dirspec/python3]

14. By dobey on 2012-07-13

Fix a few tests on Windows

[Diego Sarmentero (diegosarmentero)]

+1 tests passing on windows, linux, mac

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'dirspec/basedir.py'
--- dirspec/basedir.py	2011-12-19 18:11:14 +0000
+++ dirspec/basedir.py	2012-07-13 19:22:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """XDG Base Directory paths."""
 
+from __future__ import unicode_literals, print_function
+
 import os
 
 from dirspec.utils import (default_cache_home,
@@ -53,16 +55,18 @@
 def get_xdg_config_dirs():
     """Get the paths for the XDG config directories."""
     result = [get_xdg_config_home()]
-    result.extend([x for x in get_env_path(
-                'XDG_CONFIG_DIRS', default_config_path).split(os.pathsep)])
+    result.extend([x.encode('utf-8') for x in get_env_path(
+                'XDG_CONFIG_DIRS',
+                default_config_path).decode('utf-8').split(os.pathsep)])
     return result
 
 
 def get_xdg_data_dirs():
     """Get the paths for the XDG data directories."""
     result = [get_xdg_data_home()]
-    result.extend([x for x in get_env_path(
-                'XDG_DATA_DIRS', default_data_path).split(os.pathsep)])
+    result.extend([x.encode('utf-8') for x in get_env_path(
+                'XDG_DATA_DIRS',
+                default_data_path).decode('utf-8').split(os.pathsep)])
     return result
 
 
@@ -77,7 +81,7 @@
     resource = os.path.join(*resource)
     assert not resource.startswith('/')
     for config_dir in get_xdg_config_dirs():
-        path = os.path.join(config_dir, resource)
+        path = os.path.join(config_dir, resource.encode('utf-8'))
         # access the file system always with unicode
         # to properly behave in some operating systems
         if os.path.exists(unicode_path(path)):
@@ -94,7 +98,7 @@
     resource = os.path.join(*resource)
     assert not resource.startswith('/')
     for data_dir in get_xdg_data_dirs():
-        path = os.path.join(data_dir, resource)
+        path = os.path.join(data_dir, resource.encode('utf-8'))
         # access the file system always with unicode
         # to properly behave in some operating systems
         if os.path.exists(unicode_path(path)):
@@ -120,11 +124,11 @@
     """
     resource = os.path.join(*resource)
     assert not resource.startswith('/')
-    path = os.path.join(get_xdg_config_home(), resource)
+    path = os.path.join(get_xdg_config_home(), resource.encode('utf-8'))
     # access the file system always with unicode
     # to properly behave in some operating systems
     if not os.path.isdir(unicode_path(path)):
-        os.makedirs(unicode_path(path), 0700)
+        os.makedirs(unicode_path(path), 0o700)
     return path
 
 
@@ -137,11 +141,11 @@
     """
     resource = os.path.join(*resource)
     assert not resource.startswith('/')
-    path = os.path.join(get_xdg_data_home(), resource)
+    path = os.path.join(get_xdg_data_home(), resource.encode('utf-8'))
     # access the file system always with unicode
     # to properly behave in some operating systems
     if not os.path.isdir(unicode_path(path)):
-        os.makedirs(unicode_path(path), 0700)
+        os.makedirs(unicode_path(path), 0o700)
     return path
 
 
@@ -150,6 +154,6 @@
 xdg_config_home = get_xdg_config_home()
 xdg_data_home = get_xdg_data_home()
 
-xdg_config_dirs = filter(lambda x: x, get_xdg_config_dirs())
-xdg_data_dirs = filter(lambda x: x, get_xdg_data_dirs())
+xdg_config_dirs = [x for x in get_xdg_config_dirs() if x]
+xdg_data_dirs = [x for x in get_xdg_data_dirs() if x]
 # pylint: disable=C0103

=== modified file 'dirspec/tests/__init__.py'
--- dirspec/tests/__init__.py	2012-07-12 18:13:19 +0000
+++ dirspec/tests/__init__.py	2012-07-13 19:22:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
@@ -15,6 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """"dirspec tests."""
 
+from __future__ import unicode_literals, print_function
+
+import os
+
+from operator import setitem
 from testtools.testcase import TestCase
 
 
@@ -23,8 +28,24 @@
 
     def assert_utf8_bytes(self, value):
         """Check that 'value' is a bytes sequence encoded with utf-8."""
-        self.assertIsInstance(value, str)
+        self.assertIsInstance(value, bytes)
         try:
             value.decode('utf-8')
-        except UnicodeDecodeError:
+        except UnicodeError:
             self.fail('%r should be a utf8 encoded string.' % value)
+
+    def tweak_env(self, envvar, value):
+        """Tweak the environment variable %var to %value.
+
+        Restore the old value when finished.
+        """
+        old_val = os.environ.get(envvar, None)
+
+        if old_val is None:
+            self.addCleanup(os.environ.pop, envvar, None)
+        else:
+            self.addCleanup(setitem, os.environ, envvar, old_val)
+        if value is None:
+            os.environ.pop(envvar, None)
+        else:
+            os.environ[envvar] = value

=== modified file 'dirspec/tests/test_basedir.py'
--- dirspec/tests/test_basedir.py	2011-12-20 17:53:34 +0000
+++ dirspec/tests/test_basedir.py	2012-07-13 19:22:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
@@ -15,37 +15,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the base directory implementation."""
 
+from __future__ import unicode_literals, print_function
+
 import os
 
 from dirspec import basedir
 from dirspec.tests import BaseTestCase
-from operator import setitem
 
 
 class BasedirTestCase(BaseTestCase):
     """Tests for XDG Base Directory paths implementation."""
 
-    def tweak_env(self, envvar, value):
-        """Tweak the environment variable %var to %value.
-
-        Restore the old value when finished.
-        """
-        old_val = os.environ.get(envvar, None)
-
-        if old_val is None:
-            self.addCleanup(os.environ.pop, envvar, None)
-        else:
-            self.addCleanup(setitem, os.environ, envvar, old_val)
-        if value is None:
-            os.environ.pop(envvar, None)
-        else:
-            os.environ[envvar] = value
-
     def test_cache_home(self):
         """Test that XDG_CACHE_HOME is handled correctly."""
         self.tweak_env('XDG_CACHE_HOME', os.path.abspath(os.path.join(
                 os.getcwd(), '_trial_temp', 'cache')))
-        self.assertEqual(os.environ['XDG_CACHE_HOME'],
+        self.assertEqual(os.environ['XDG_CACHE_HOME'].encode('utf-8'),
                          basedir.get_xdg_cache_home())
 
     def test_config_dirs(self):
@@ -53,14 +38,15 @@
         self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
                 os.getcwd(), '_trial_temp', 'config')))
         self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(['etc']))
-        self.assertEqual([os.environ['XDG_CONFIG_HOME'], 'etc'],
+        self.assertEqual([os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
+                          b'etc'],
                          basedir.get_xdg_config_dirs())
 
     def test_config_home(self):
         """Test that XDG_CONFIG_DIRS is handled correctly."""
         self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
                 os.getcwd(), '_trial_temp', 'config')))
-        self.assertEqual(os.environ['XDG_CONFIG_HOME'],
+        self.assertEqual(os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
                          basedir.get_xdg_config_home())
 
     def test_data_dirs(self):
@@ -68,20 +54,21 @@
         self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
                 os.getcwd(), '_trial_temp', 'xdg_data')))
         self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(['foo', 'bar']))
-        self.assertEqual([os.environ['XDG_DATA_HOME'], 'foo', 'bar'],
+        self.assertEqual([os.environ['XDG_DATA_HOME'].encode('utf-8'),
+                          b'foo', b'bar'],
                          basedir.get_xdg_data_dirs())
 
     def test_data_home(self):
         """Test that XDG_DATA_HOME is handled correctly."""
         self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
                 os.getcwd(), '_trial_temp', 'xdg_data')))
-        self.assertEqual(os.environ['XDG_DATA_HOME'],
+        self.assertEqual(os.environ['XDG_DATA_HOME'].encode('utf-8'),
                          basedir.get_xdg_data_home())
 
     def test_default_cache_home(self):
         """Ensure default values work correctly."""
         self.tweak_env('XDG_CACHE_HOME', None)
-        expected = '/blah'
+        expected = b'/blah'
         self.patch(basedir, 'default_cache_home', expected)
         self.assertFalse(os.environ.get('XDG_CACHE_HOME', False))
         self.assertEqual(basedir.get_xdg_cache_home(), expected)
@@ -90,17 +77,17 @@
         """Ensure default values work correctly."""
         self.tweak_env('XDG_CONFIG_DIRS', None)
         self.tweak_env('XDG_CONFIG_HOME', None)
-        expected = '/blah'
+        expected = b'/blah'
         self.patch(basedir, 'default_config_home', expected)
         self.patch(basedir, 'default_config_path', '')
         self.assertFalse(os.environ.get('XDG_CONFIG_DIRS', False))
         self.assertFalse(os.environ.get('XDG_CONFIG_HOME', False))
-        self.assertEqual(basedir.get_xdg_config_dirs(), [expected, ''])
+        self.assertEqual(basedir.get_xdg_config_dirs(), [expected, b''])
 
     def test_default_config_home(self):
         """Ensure default values work correctly."""
         self.tweak_env('XDG_CONFIG_HOME', None)
-        expected = '/blah'
+        expected = b'/blah'
         self.patch(basedir, 'default_config_home', expected)
         self.assertFalse(os.environ.get('XDG_CONFIG_HOME', False))
         self.assertEqual(basedir.get_xdg_config_home(), expected)
@@ -109,17 +96,17 @@
         """Ensure default values work correctly."""
         self.tweak_env('XDG_DATA_DIRS', None)
         self.tweak_env('XDG_DATA_HOME', None)
-        expected = '/blah'
+        expected = b'/blah'
         self.patch(basedir, 'default_data_home', expected)
         self.patch(basedir, 'default_data_path', '')
         self.assertFalse(os.environ.get('XDG_DATA_DIRS', False))
         self.assertFalse(os.environ.get('XDG_DATA_HOME', False))
-        self.assertEqual(basedir.get_xdg_data_dirs(), [expected, ''])
+        self.assertEqual(basedir.get_xdg_data_dirs(), [expected, b''])
 
     def test_default_data_home(self):
         """Ensure default values work correctly."""
         self.tweak_env('XDG_DATA_HOME', None)
-        expected = '/blah'
+        expected = b'/blah'
         self.patch(basedir, 'default_data_home', expected)
         self.assertFalse(os.environ.get('XDG_DATA_HOME', False))
         self.assertEqual(basedir.get_xdg_data_home(), expected)
@@ -160,4 +147,5 @@
         self.tweak_env('XDG_CONFIG_HOME', 'config_home')
         self.patch(os, "makedirs", lambda *args: None)
         result = basedir.save_config_path("x")
-        self.assertEqual(result.split(os.sep)[-2:], ['config_home', 'x'])
+        self.assertEqual(result.decode('utf-8').split(os.sep)[-2:],
+                         ['config_home', 'x'])

=== modified file 'dirspec/tests/test_utils.py'
--- dirspec/tests/test_utils.py	2012-07-12 19:11:25 +0000
+++ dirspec/tests/test_utils.py	2012-07-13 19:22:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for utilities for the base directory implementation."""
+
+from __future__ import unicode_literals, print_function
+
 import os
 import sys
 
@@ -48,9 +51,9 @@
     def __init__(self):
         """Set the proper mapping between CSIDL_ consts."""
         self.values = {
-            0: u'c:\\path\\to\\users\\home',
-            1: u'c:\\path\\to\\users\\home\\appData\\local',
-            2: u'c:\\programData',
+            0: 'c:\\path\\to\\users\\home',
+            1: 'c:\\path\\to\\users\\home\\appData\\local',
+            2: 'c:\\programData',
         }
 
     # pylint: disable=C0103
@@ -92,36 +95,23 @@
 
         for val in special_folders.itervalues():
             self.assertIsInstance(val, str)
-            val.decode('utf8')
+            val.encode('utf-8')
 
     def test_get_data_dirs(self):
         """Check thet get_data_dirs uses pathsep correctly."""
-        bad_sep = filter(lambda x: x not in os.pathsep, ":;")
+        bad_sep = str(filter(lambda x: x not in os.pathsep, ":;"))
         dir_list = ["A", "B", bad_sep, "C"]
-        self.patch(os, "environ",
-            dict(XDG_DATA_DIRS=os.pathsep.join(
-                dir_list)))
+        self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(dir_list))
         dirs = basedir.get_xdg_data_dirs()[1:]
-        self.assertEqual(dirs, dir_list)
+        self.assertEqual(dirs, [x.encode('utf-8') for x in dir_list])
 
     def test_get_config_dirs(self):
         """Check thet get_data_dirs uses pathsep correctly."""
-        bad_sep = filter(lambda x: x not in os.pathsep, ":;")
+        bad_sep = str(filter(lambda x: x not in os.pathsep, ":;"))
         dir_list = ["A", "B", bad_sep, "C"]
-        self.patch(os, "environ",
-            dict(XDG_CONFIG_DIRS=os.pathsep.join(
-                dir_list)))
+        self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(dir_list))
         dirs = basedir.get_xdg_config_dirs()[1:]
-        self.assertEqual(dirs, dir_list)
-
-    def set_fake_environ(self, key, value):
-        """Set (and restore) a fake environ variable."""
-        if key in os.environ:
-            prev = os.environ[key]
-            self.addCleanup(os.environ.__setitem__, key, prev)
-        else:
-            self.addCleanup(os.environ.__delitem__, key)
-        os.environ[key] = value
+        self.assertEqual(dirs, [x.encode('utf-8') for x in dir_list])
 
     def unset_fake_environ(self, key):
         """Unset (and restore) a fake environ variable."""
@@ -133,19 +123,18 @@
     @skip('UnicodeEncodeError: bug #907053')
     def test_get_env_path_var(self):
         """Test that get_env_path transforms an env var."""
-        fake_path = u"C:\\Users\\Ñandú"
-        fake_env_var = "FAKE_ENV_VAR"
+        fake_path = 'C:\\Users\\Ñandú'
+        fake_env_var = 'FAKE_ENV_VAR'
 
         mbcs_path = fake_path.encode(sys.getfilesystemencoding())
-        utf8_path = fake_path.encode("utf-8")
 
-        self.set_fake_environ(fake_env_var, mbcs_path)
-        self.assertEqual(get_env_path(fake_env_var, "unexpected"), utf8_path)
+        self.tweak_env(fake_env_var, str(mbcs_path))
+        self.assertEqual(get_env_path(fake_env_var, "unexpected"), fake_path)
 
     @skip('UnicodeEncodeError: bug #907053')
     def test_get_env_path_no_var(self):
         """Test that get_env_path returns the default when env var not set."""
-        fake_path = u"C:\\Users\\Ñandú"
+        fake_path = "C:\\Users\\Ñandú"
         fake_env_var = "fake_env_var"
         default = fake_path.encode(sys.getfilesystemencoding())
 
@@ -172,7 +161,7 @@
     def test_unfrozen_dev_toplevel(self):
         """Not frozen, return path to bin dir."""
         path = get_program_path("foo", fallback_dirs=['/path/to/bin'])
-        self.assertEquals(path, "/path/to/bin/foo")
+        self.assertEquals(path, os.path.join("/path/to/bin", "foo"))
 
     def test_unfrozen_dev_toplevel_raises_nopath(self):
         """Not frozen, raise OSError when the path doesn't exist."""
@@ -199,9 +188,10 @@
     def test_darwin_pkgd(self):
         """Return sub-app path on darwin when frozen."""
         path = get_program_path("foo", app_names=self.darwin_app_names)
-        expectedpath = "%s/%s" % (
+        expectedpath = "%s%s" % (
             dirutils.__file__,
-            "Contents/Resources/Foo.app/Contents/MacOS/foo")
+            os.path.sep + os.path.join('Contents', 'Resources', 'Foo.app',
+                                       'Contents', 'MacOS', 'foo'))
         self.assertEquals(path, expectedpath)
 
     def test_darwin_pkgd_raises_on_no_appnames(self):
@@ -257,7 +247,7 @@
     def test_linux_src_relative_path_exists(self):
         """linux, return source relative path if it exists."""
         path = get_program_path("foo", fallback_dirs=['/path/to/bin'])
-        expectedpath = "/path/to/bin/foo"
+        expectedpath = os.path.join("/path/to/bin", "foo")
         self.assertEquals(path, expectedpath)
 
     def test_linux_no_src_relative_path(self):

=== modified file 'dirspec/utils.py'
--- dirspec/utils.py	2012-07-10 21:06:40 +0000
+++ dirspec/utils.py	2012-07-13 19:22:21 +0000
@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Utilities for multiplatform support of XDG directory handling."""
 
+from __future__ import unicode_literals, print_function
+
 import errno
 import os
 import sys
@@ -104,15 +106,22 @@
     if key in os.environ:
         # on windows, environment variables are mbcs bytes
         # so we must turn them into utf-8 Syncdaemon paths
-        path = os.environ.get(key)
-        return path.decode(sys.getfilesystemencoding()).encode("utf-8")
+        try:
+            path = os.environb.get(key.encode('utf-8'))
+        except AttributeError:
+            path = os.environ[key]
+        return path.decode(sys.getfilesystemencoding()).encode('utf-8')
     else:
+        if not isinstance(default, bytes):
+            return default.encode('utf-8')
         return default
 
 
 def unicode_path(utf8path):
-    """Turn a UTF-8 path into a unicode path."""
-    return utf8path.decode("utf-8")
+    """Turn an utf8 path into a unicode path."""
+    if isinstance(utf8path, bytes):
+        return utf8path.decode("utf-8")
+    return utf8path
 
 
 def get_special_folders():
@@ -153,13 +162,16 @@
     user_home = special_folders['Personal']
     default_config_path = special_folders['Common AppData']
     default_config_home = special_folders['Local AppData']
-    default_data_path = os.path.join(default_config_path, 'xdg')
-    default_data_home = os.path.join(default_config_home, 'xdg')
-    default_cache_home = os.path.join(default_data_home, 'cache')
+    default_data_path = os.path.join(default_config_path, 'bxdg')
+    default_data_home = os.path.join(default_config_home, b'xdg')
+    default_cache_home = os.path.join(default_data_home, b'cache')
 else:
-    user_home = os.path.expanduser('~')
-    default_cache_home = os.path.join(user_home, '.cache')
-    default_config_path = '/etc/xdg'
-    default_config_home = os.path.join(user_home, '.config')
-    default_data_path = '/usr/local/share:/usr/share'
-    default_data_home = os.path.join(user_home, '.local', 'share')
+    user_home = os.path.expanduser(b'~')
+    default_cache_home = os.path.join(user_home,
+                                      b'.cache')
+    default_config_path = b'/etc/xdg'
+    default_config_home = os.path.join(user_home,
+                                       b'.config')
+    default_data_path = b'/usr/local/share:/usr/share'
+    default_data_home = os.path.join(user_home,
+                                     b'.local', b'share')

=== modified file 'run-tests'
--- run-tests	2012-07-12 18:13:19 +0000
+++ run-tests	2012-07-13 19:22:21 +0000
@@ -19,6 +19,13 @@
 # Run the tests
 python ./setup.py build test clean
 
+# Only run the python3 tests if available
+if [ -x "`which python3`" ]; then
+    python3 ./setup.py build test clean
+else
+    echo "Python 3 not found. Not running Python 3 tests."
+fi
+
 # Run the style checks
 pyflakes dirspec setup.py
 pep8 --repeat . setup.py

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-12-19 18:43:32 +0000
+++ run-tests.bat	2012-07-13 19:22:21 +0000
@@ -1,6 +1,4 @@
-:: Author: Manuel de la Pena <[e-mail]>
-::
-:: Copyright 2010-2011 Canonical Ltd.
+:: Copyright 2010-2012 Canonical Ltd.
 ::
 :: This program is free software: you can redistribute it and/or modify it
 :: under the terms of the GNU Lesser General Public License version 3,
@@ -35,20 +33,14 @@
 ECHO Please ensure you have python installed
 GOTO :END
 
-:: Using trial.py is different on Windows, so we need to set PYTHONPATH
-SET PYTHONPATH=.
-
 :PYTHONPRESENT
 ECHO Python found, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXECPATH%\python.exe" "%PYTHONEXECPATH%\Scripts\trial.py" dirspec
+"%PYTHONEXECPATH%\python.exe" setup.py build test clean
 "%PYTHONEXECPATH%\python.exe" "%PYTHONEXECPATH%\Scripts\pyflakes" dirspec
 :: test for style if we can, if pep8 is not present, move to the end
 IF EXIST "%PYTHONEXECPATH%Scripts\pep8.exe"
 "%PYTHONEXECPATH%\Scripts\pep8.exe" --repeat dirspec
 ELSE
 ECHO Style checks were not done
-:: Delete the temp folders
-RMDIR /s /q _trial_temp
-RMDIR /s /q .coverage
 :END

=== modified file 'setup.py'
--- setup.py	2012-07-12 18:13:19 +0000
+++ setup.py	2012-07-13 19:22:21 +0000
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3