Merge lp:~jderose/userwebkit/py3.3 into lp:userwebkit

[Jason Gerard DeRose]

For details, see this bug:

https://bugs.launchpad.net/userwebkit/+bug/1131052

Changes:

* Move userwebkit.py to userwebkit/__init__.py

* Move test_userwebkit.py to userwebkit/tests/__init__.py

* Added userwebkit.tests.run module, which allows you to run the tests like this:

python3 -m userwebkit.tests.run

* To be consisted with other components, drop Python 3.2 support, require Python 3.3 or newer

[Jason Gerard DeRose (jderose)]

Gotta rush, gonna self-approve this one.

review: Approve

[Angel Guzman Maeso (shakaran)]

Much more cleaner now. Looks fine for me with only Python 3.3+ support.

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-09-26 10:58:32 +0000
+++ MANIFEST.in	2013-02-21 06:21:20 +0000
@@ -1,1 +1,1 @@
-include COPYING COPYING.LESSER test_userwebkit.py
+include COPYING COPYING.LESSER

=== modified file 'debian/control'
--- debian/control	2012-11-15 03:26:59 +0000
+++ debian/control	2013-02-21 06:21:20 +0000
@@ -3,23 +3,23 @@
 Priority: optional
 Maintainer: Jason Gerard DeRose <[e-mail]>
 Build-Depends: debhelper (>= 9),
-    python3-all (>= 3.2.3),
-    python3-microfiber (>= 12.11),
-    python3-usercouch (>= 12.11),
-    python3-dbus,
-    python3-gi,
-    gir1.2-gtk-3.0,
-    gir1.2-webkit-3.0,
+    python3-all (>= 3.3),
     xvfb,
+    python3-microfiber (>= 13.02),
+    python3-usercouch (>= 13.02),
+    python3-dbus,
+    python3-gi,
+    gir1.2-gtk-3.0,
+    gir1.2-webkit-3.0,
 Standards-Version: 3.9.3
-X-Python3-Version: >= 3.2
+X-Python3-Version: >= 3.3
 Homepage: https://launchpad.net/userwebkit
 
 Package: python3-userwebkit
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends},
-    python3-microfiber (>= 12.11),
-    python3-usercouch (>= 12.11) | dc3 (>= 12.02),
+    python3-microfiber (>= 13.02),
+    python3-usercouch (>= 13.02),
     python3-dbus,
     python3-gi,
     gir1.2-gtk-3.0,

=== modified file 'setup.py'
--- setup.py	2013-01-29 08:33:53 +0000
+++ setup.py	2013-02-21 06:21:20 +0000
@@ -26,13 +26,11 @@
 """
 
 import sys
-if sys.version_info < (3, 2):
-    sys.exit('ERROR: UserWebKit requires Python 3.2 or newer')
+if sys.version_info < (3, 3):
+    sys.exit('ERROR: UserWebKit requires Python 3.3 or newer')
 
 from distutils.core import setup
 from distutils.cmd import Command
-from unittest import TestLoader, TextTestRunner
-from doctest import DocTestSuite
 import os
 from os import path
 
@@ -49,21 +47,9 @@
         pass
 
     def run(self):
-        pynames = ['userwebkit', 'test_userwebkit']
-
-        # Add unit-tests:
-        loader = TestLoader()
-        suite = loader.loadTestsFromNames(pynames)
-
-        # Add doc-tests:
-        for name in pynames:
-            suite.addTest(DocTestSuite(name))
-
-        # Run the tests:
-        runner = TextTestRunner(verbosity=2)
-        result = runner.run(suite)
-        if not result.wasSuccessful():
-            raise SystemExit(2)
+        from userwebkit.tests.run import run_tests
+        if not run_tests():
+            raise SystemExit('2')
 
 
 setup(
@@ -74,14 +60,12 @@
     author='Jason Gerard DeRose',
     author_email='[e-mail]',
     license='LGPLv3+',
-    py_modules=['userwebkit'],
-    cmdclass={
-        'test': Test,
-        #'build': build_with_docs,
-    },
+    packages=['userwebkit', 'userwebkit.tests'],
+    cmdclass={'test': Test},
     data_files=[
         ('share/couchdb/apps/userwebkit',
             [path.join('ui', name) for name in os.listdir('ui')]
         ),
     ],
 )
+

=== added directory 'userwebkit'
=== renamed file 'userwebkit.py' => 'userwebkit/__init__.py'
--- userwebkit.py	2013-01-29 08:33:53 +0000
+++ userwebkit/__init__.py	2013-02-21 06:21:20 +0000
@@ -34,8 +34,7 @@
 from microfiber import _oauth_header, _basic_auth_header
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
-from gi.repository import GObject, Gtk, WebKit
-from gi.repository.GObject import TYPE_PYOBJECT
+from gi.repository import GLib, GObject, Gtk, WebKit
 
 
 __version__ = '13.02.0'
@@ -55,7 +54,7 @@
 class CouchView(WebKit.WebView):
     __gsignals__ = {
         'open': (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
-            [TYPE_PYOBJECT]
+            [GObject.TYPE_PYOBJECT]
         ),
     }
 
@@ -209,7 +208,7 @@
     assert isinstance(signals, dict)
     for (name, argnames) in signals.items():
         assert isinstance(argnames, list)
-        args = [TYPE_PYOBJECT for argname in argnames]
+        args = [GObject.TYPE_PYOBJECT for argname in argnames]
         yield (name, (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, args))
 
 
@@ -327,7 +326,7 @@
         self.parse()
         self.build_window()
         self.window.show_all()
-        GObject.idle_add(self.on_idle)
+        GLib.idle_add(self.on_idle)
         Gtk.main()
 
     def quit(self, *arg):

=== added directory 'userwebkit/tests'
=== renamed file 'test_userwebkit.py' => 'userwebkit/tests/__init__.py'
=== added file 'userwebkit/tests/run.py'
--- userwebkit/tests/run.py	1970-01-01 00:00:00 +0000
+++ userwebkit/tests/run.py	2013-02-21 06:21:20 +0000
@@ -0,0 +1,68 @@
+# userwebkit: so WebKitGtk apps can to talk to a usercouch
+# Copyright (C) 2013 Novacut Inc
+# 
+# This file is part of `userwebkit`.
+# 
+# `userwebkit` is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+# 
+# `userwebkit` is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU Lesser General Public License along
+# with `userwebkit`.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+
+
+"""
+Run the `userwebkit` unit tests.
+
+From the command line, run like this::
+
+    $ python3 -m userwebkit.tests.run
+"""
+
+import sys
+from os import path
+from unittest import TestLoader, TextTestRunner
+from doctest import DocTestSuite
+
+import userwebkit
+
+
+pynames = (
+    'userwebkit',
+    'userwebkit.tests',
+)
+
+
+def run_tests():
+    # Add unit-tests:
+    loader = TestLoader()
+    suite = loader.loadTestsFromNames(pynames)
+
+    # Add doc-tests:
+    for name in pynames:
+        suite.addTest(DocTestSuite(name))
+
+    # Run the tests:
+    runner = TextTestRunner(verbosity=2)
+    result = runner.run(suite)
+    success =  result.wasSuccessful()
+    print(
+        'userwebkit: {!r}'.format(path.abspath(userwebkit.__file__)),
+        file=sys.stderr
+    )
+    print('-' * 70, file=sys.stderr)
+    return result.wasSuccessful()
+
+
+if __name__ == '__main__':
+    if not run_tests():
+        raise SystemExit('2')