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
=== modified file 'setup.py'
--- setup.py 2012-07-05 16:43:26 +0000
+++ setup.py 2012-09-13 02:16:20 +0000
@@ -1,3 +1,24 @@
1#
2# Copyright (c) 2010 Canonical
3#
4# Written by Gustavo Niemeyer <gustavo@niemeyer.net>
5#
6# This file is part of the Xpresser GUI automation library.
7#
8# Xpresser is free software; you can redistribute it and/or modify
9# it under the terms of the GNU Lesser General Public License version 3,
10# as published by the Free Software Foundation.
11#
12# Xpresser is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Lesser General Public License for more details.
16#
17# You should have received a copy of the GNU Lesser General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20
21
1#!/usr/bin/env python22#!/usr/bin/env python
223
3from distutils.core import setup24from distutils.core import setup
@@ -7,6 +28,6 @@
7 description='Python library to script Graphic User Interfaces.',28 description='Python library to script Graphic User Interfaces.',
8 author='Gustavo Niemeyer',29 author='Gustavo Niemeyer',
9 author_email='gustavo.niemeyer@canonical.com',30 author_email='gustavo.niemeyer@canonical.com',
10 url='https://edge.launchpad.net/xpresser',31 url='http://xpresser.com',
11 packages=['xpresser'],32 packages=['xpresser'],
12 )33 )
1334
=== modified file 'xpresser/lib/mocker.py'
--- xpresser/lib/mocker.py 2010-05-16 22:59:48 +0000
+++ xpresser/lib/mocker.py 2012-09-13 02:16:20 +0000
@@ -1,3 +1,24 @@
1#
2# Copyright (c) 2010 Canonical
3#
4# Written by Gustavo Niemeyer <gustavo@niemeyer.net>
5#
6# This file is part of the Xpresser GUI automation library.
7#
8# Xpresser is free software; you can redistribute it and/or modify
9# it under the terms of the GNU Lesser General Public License version 3,
10# as published by the Free Software Foundation.
11#
12# Xpresser is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Lesser General Public License for more details.
16#
17# You should have received a copy of the GNU Lesser General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20
21
1"""22"""
2Copyright (c) 2007 Gustavo Niemeyer <gustavo@niemeyer.net>23Copyright (c) 2007 Gustavo Niemeyer <gustavo@niemeyer.net>
324
425
=== modified file 'xpresser/tests/test_xutils.py'
--- xpresser/tests/test_xutils.py 2012-08-23 17:11:45 +0000
+++ xpresser/tests/test_xutils.py 2012-09-13 02:16:20 +0000
@@ -80,7 +80,7 @@
80 window.present()80 window.present()
81 entry.grab_focus()81 entry.grab_focus()
82 self.flush_gtk()82 self.flush_gtk()
83 xutils.type("Hello there!")83 xutils.type("Hello there!", 0.4)
84 self.flush_gtk()84 self.flush_gtk()
85 self.assertEquals(entry.get_text(), "Hello there!")85 self.assertEquals(entry.get_text(), "Hello there!")
86 finally:86 finally:
@@ -93,7 +93,7 @@
93 window.present()93 window.present()
94 entry.grab_focus()94 entry.grab_focus()
95 self.flush_gtk()95 self.flush_gtk()
96 xutils.type(["<Shift>", "hi there"])96 xutils.type(["<Shift>", "hi there"], 0.4)
97 self.flush_gtk()97 self.flush_gtk()
98 self.assertEquals(entry.get_text(), "HI THERE")98 self.assertEquals(entry.get_text(), "HI THERE")
99 finally:99 finally:

Subscribers

People subscribed via source and target branches

to all changes: