Merge lp:~xpresser-team/xpresser/cleanup into lp:xpresser

Proposed by Chris Wayne
Status: Merged
Approved by: Chris Gagnon
Approved revision: 16
Merged at revision: 15
Proposed branch: lp:~xpresser-team/xpresser/cleanup
Merge into: lp:xpresser
Diff against target: 87 lines (+45/-3)
3 files modified
setup.py (+22/-1)
xpresser/lib/mocker.py (+21/-0)
xpresser/tests/test_xutils.py (+2/-2)
To merge this branch: bzr merge lp:~xpresser-team/xpresser/cleanup
Reviewer Review Type Date Requested Status
Chris Gagnon (community) Approve
Review via email: mp+124090@code.launchpad.net

Description of the change

Cleaning up, i.e. taking out the un-needed .pyc files, and fixing the xutils.type() unit tests (needed to add in the hold arg)

To post a comment you must log in.
Revision history for this message
Chris Gagnon (chris.gagnon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-07-05 16:43:26 +0000
3+++ setup.py 2012-09-13 02:16:20 +0000
4@@ -1,3 +1,24 @@
5+#
6+# Copyright (c) 2010 Canonical
7+#
8+# Written by Gustavo Niemeyer <gustavo@niemeyer.net>
9+#
10+# This file is part of the Xpresser GUI automation library.
11+#
12+# Xpresser is free software; you can redistribute it and/or modify
13+# it under the terms of the GNU Lesser General Public License version 3,
14+# as published by the Free Software Foundation.
15+#
16+# Xpresser is distributed in the hope that it will be useful,
17+# but WITHOUT ANY WARRANTY; without even the implied warranty of
18+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+# GNU Lesser General Public License for more details.
20+#
21+# You should have received a copy of the GNU Lesser General Public License
22+# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+#
24+
25+
26 #!/usr/bin/env python
27
28 from distutils.core import setup
29@@ -7,6 +28,6 @@
30 description='Python library to script Graphic User Interfaces.',
31 author='Gustavo Niemeyer',
32 author_email='gustavo.niemeyer@canonical.com',
33- url='https://edge.launchpad.net/xpresser',
34+ url='http://xpresser.com',
35 packages=['xpresser'],
36 )
37
38=== modified file 'xpresser/lib/mocker.py'
39--- xpresser/lib/mocker.py 2010-05-16 22:59:48 +0000
40+++ xpresser/lib/mocker.py 2012-09-13 02:16:20 +0000
41@@ -1,3 +1,24 @@
42+#
43+# Copyright (c) 2010 Canonical
44+#
45+# Written by Gustavo Niemeyer <gustavo@niemeyer.net>
46+#
47+# This file is part of the Xpresser GUI automation library.
48+#
49+# Xpresser is free software; you can redistribute it and/or modify
50+# it under the terms of the GNU Lesser General Public License version 3,
51+# as published by the Free Software Foundation.
52+#
53+# Xpresser is distributed in the hope that it will be useful,
54+# but WITHOUT ANY WARRANTY; without even the implied warranty of
55+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
56+# GNU Lesser General Public License for more details.
57+#
58+# You should have received a copy of the GNU Lesser General Public License
59+# along with this program. If not, see <http://www.gnu.org/licenses/>.
60+#
61+
62+
63 """
64 Copyright (c) 2007 Gustavo Niemeyer <gustavo@niemeyer.net>
65
66
67=== modified file 'xpresser/tests/test_xutils.py'
68--- xpresser/tests/test_xutils.py 2012-08-23 17:11:45 +0000
69+++ xpresser/tests/test_xutils.py 2012-09-13 02:16:20 +0000
70@@ -80,7 +80,7 @@
71 window.present()
72 entry.grab_focus()
73 self.flush_gtk()
74- xutils.type("Hello there!")
75+ xutils.type("Hello there!", 0.4)
76 self.flush_gtk()
77 self.assertEquals(entry.get_text(), "Hello there!")
78 finally:
79@@ -93,7 +93,7 @@
80 window.present()
81 entry.grab_focus()
82 self.flush_gtk()
83- xutils.type(["<Shift>", "hi there"])
84+ xutils.type(["<Shift>", "hi there"], 0.4)
85 self.flush_gtk()
86 self.assertEquals(entry.get_text(), "HI THERE")
87 finally:

Subscribers

People subscribed via source and target branches

to all changes: