Merge lp:~xpresser-team/xpresser/xpresser-type-with-hold into lp:xpresser

[Chris Wayne]

Removing debian packaging (shouldn't be in the upstream release), and adding hold for special key presses (to differentiate between taps and holds)

[Chris Gagnon (chris.gagnon)]

works good

review: Approve

=== removed directory 'debian'
=== removed file 'debian/changelog'
--- debian/changelog	2012-08-18 18:37:49 +0000
+++ debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-xpresser (1.1.3) precise; urgency=low
-
-  * Adding in special key support
-
-  [Chris Gagnon]
-  * reversed keys_to_press for key release so things like ctrl-alt-
-    backspace wont delete a typed key
-
-  [Chris Wayne]
-  * Fixed sleep after each key press
-  * Added some more special keys (all F keys, Function, and others)
-
- -- Chris Wayne <[e-mail]>  Sat, 18 Aug 2012 14:36:12 -0400
-
-xpresser (1.1.2) precise; urgency=low
-
-  * Small fix
-
- -- Chris Wayne <[e-mail]>  Thu, 19 Jul 2012 21:01:24 -0400
-
-xpresser (1.1.1) precise; urgency=low
-
-  * Adding in python-gi-cairo as a build dependency
-
- -- Chris Wayne <[e-mail]>  Thu, 19 Jul 2012 20:29:24 -0400
-
-xpresser (1.1) precise; urgency=low
-
-  * Initial Precise release into Xpresser PPA
-
-  * Double click functionality added
-
- -- Chris Wayne <[e-mail]>  Thu, 05 Jul 2012 09:49:22 -0400
-
-xpresser (1.0-1) unstable; urgency=low
-
-  * source package automatically created by stdeb 0.6.0+git
-
- -- Gustavo Niemeyer <[e-mail]>  Tue, 25 Oct 2011 15:12:21 -0400
 
=== removed file 'debian/compat'
--- debian/compat	2012-07-05 15:56:48 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-9
 
=== removed file 'debian/control'
--- debian/control	2012-07-25 01:44:55 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Source: xpresser
-Maintainer: Ubuntu Developers <[e-mail]>
-Section: python
-Priority: extra
-Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 9)
-Standards-Version: 3.9.3
-
-Package: python-xpresser
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-opencv, python-pyatspi2, python-numpy, python-simplecv, python-gi-cairo
-Description: Python library to script Graphic User Interfaces.
- Xpresser is a python library to automate GUI testing.  It uses screenshot matching
- to make automation easy, and can emulate actual user testing, rather than through
- introspection.
 
=== removed file 'debian/copyright'
--- debian/copyright	2012-07-05 16:35:07 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: python-xpresser
-Source: http://bazaar.launchpad.net/~xpresser-team/xpresser
-
-Files: *
-Copyright: 2012 Canonical Ltd.
-License: LGPL-3
-
-License: LGPL-3
- This program 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, version 3 of the License.
- .
- This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public License
- version 3 can be found in the file /usr/share/common-licenses/LGPL-3.
 
=== removed file 'debian/rules'
--- debian/rules	2012-03-08 17:20:18 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/make -f
-
-# This file was automatically generated by stdeb 0.6.0+git at
-# Tue, 25 Oct 2011 15:12:21 -0400
-
-%:
-	dh $@ --with python2 --buildsystem=python_distutils
-
-
 
=== removed directory 'debian/source'
=== removed file 'debian/watch'
--- debian/watch	2012-07-05 16:57:07 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-http://launchpad.net/xpresser/+download .*/Xpresser-(.+)\.tar\.gz
-
 
=== removed directory 'dist'
=== removed file 'dist/Xpresser-1.1.tar.gz'
 Binary files dist/Xpresser-1.1.tar.gz	2012-07-05 16:48:40 +0000 and dist/Xpresser-1.1.tar.gz	1970-01-01 00:00:00 +0000 differ
=== modified file 'xpresser/xp.py'
--- xpresser/xp.py	2012-05-21 19:57:09 +0000
+++ xpresser/xp.py	2012-09-12 16:31:25 +0000
@@ -122,7 +122,7 @@
         """
         self.find(image, timeout)
 
-    def type(self, string):
+    def type(self, string, hold=0.4):
         """Enter the string provided as if it was typed via the keyboard.
         """
-        xutils.type(string)
+        xutils.type(string, hold)
 
=== modified file 'xpresser/xutils.py'
--- xpresser/xutils.py	2012-08-23 17:32:08 +0000
+++ xpresser/xutils.py	2012-09-12 16:31:25 +0000
@@ -45,7 +45,7 @@
 def hover(x, y):
     pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_ABS)
 
-def type(string):
+def type(string, hold):
     if isinstance(string, types.ListType):
         keys_to_press = []
         for string_part in string:
@@ -56,7 +56,7 @@
                 __type_standard(string_part)
         keys_to_press.reverse()
         #hold the key long enough to constitute a hold, not a tap
-        time.sleep(.4)
+        time.sleep(hold)
         for keys in keys_to_press:
             __release_key(keys)
     else: