Hello community,
here is the log from the commit of package python-PyVirtualDisplay for
openSUSE:Factory checked in at 2013-01-14 22:25:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyVirtualDisplay (Old)
and /work/SRC/openSUSE:Factory/.python-PyVirtualDisplay.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyVirtualDisplay", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-PyVirtualDisplay/python-PyVirtualDisplay.changes
2012-03-27 08:58:24.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-PyVirtualDisplay.new/python-PyVirtualDisplay.changes
2013-01-14 22:25:50.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Jan 11 21:24:15 UTC 2013 - [email protected]
+
+- Initial python3 support
+
+-------------------------------------------------------------------
+Fri Jan 11 21:23:46 UTC 2013 - [email protected]
+
+- Update to 0.1.1 version:
+ * bugfix for wx pyscreenshot backend
+ * remove entrypoint2 dependency
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2013-01-09 19:40:42.352580873 +0100
+++
/work/SRC/openSUSE:Factory/.python-PyVirtualDisplay.new/python3-PyVirtualDisplay.changes
2013-01-14 22:25:50.000000000 +0100
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Fri Jan 11 21:24:15 UTC 2013 - [email protected]
+
+- Initial python3 support
Old:
----
PyVirtualDisplay-0.1.0.tar.gz
New:
----
PyVirtualDisplay-0.1.1.tar.gz
python3-PyVirtualDisplay.changes
python3-PyVirtualDisplay.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyVirtualDisplay.spec ++++++
--- /var/tmp/diff_new_pack.oaJhcW/_old 2013-01-14 22:25:51.000000000 +0100
+++ /var/tmp/diff_new_pack.oaJhcW/_new 2013-01-14 22:25:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-PyVirtualDisplay
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
Name: python-PyVirtualDisplay
-Version: 0.1.0
+Version: 0.1.1
Release: 0
Url: https://github.com/ponty/PyVirtualDisplay
Summary: Python wrapper for Xvfb, Xephyr and Xvnc
++++++ python3-PyVirtualDisplay.spec ++++++
#
# spec file for package python3-PyVirtualDisplay
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: python3-PyVirtualDisplay
Version: 0.1.1
Release: 0
Url: https://github.com/ponty/PyVirtualDisplay
Summary: Python wrapper for Xvfb, Xephyr and Xvnc
License: BSD-2-Clause
Group: Development/Languages/Python
Source:
http://pypi.python.org/packages/source/P/PyVirtualDisplay/PyVirtualDisplay-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python3
BuildRequires: python3-2to3
BuildRequires: python3-devel
BuildRequires: python3-distribute
Requires: xorg-x11-Xvnc
Requires: python(abi) = %{py3_ver}
BuildArch: noarch
%description
pyvirtualdisplay is a python wrapper for Xvfb, Xephyr and Xvnc
%prep
%setup -q -n PyVirtualDisplay-%{version}
%build
python3 setup.py build
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
%files
%defattr(-,root,root,-)
%doc README.rst LICENSE.txt
%{python3_sitelib}/*
%changelog
++++++ PyVirtualDisplay-0.1.0.tar.gz -> PyVirtualDisplay-0.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyVirtualDisplay-0.1.0/PKG-INFO
new/PyVirtualDisplay-0.1.1/PKG-INFO
--- old/PyVirtualDisplay-0.1.0/PKG-INFO 2012-03-10 19:10:22.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/PKG-INFO 2012-12-02 18:18:06.000000000 +0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: PyVirtualDisplay
-Version: 0.1.0
+Version: 0.1.1
Summary: python wrapper for Xvfb, Xephyr and Xvnc
Home-page: https://github.com/ponty/PyVirtualDisplay
Author: ponty
@@ -72,6 +72,8 @@
sudo apt-get install python-imaging
sudo apt-get install scrot
sudo pip install pyscreenshot
+ # optional for examples
+ sudo pip install entrypoint2
Uninstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/PKG-INFO
new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/PKG-INFO
--- old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/PKG-INFO
2012-03-10 19:10:21.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/PKG-INFO
2012-12-02 18:18:06.000000000 +0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: PyVirtualDisplay
-Version: 0.1.0
+Version: 0.1.1
Summary: python wrapper for Xvfb, Xephyr and Xvnc
Home-page: https://github.com/ponty/PyVirtualDisplay
Author: ponty
@@ -72,6 +72,8 @@
sudo apt-get install python-imaging
sudo apt-get install scrot
sudo pip install pyscreenshot
+ # optional for examples
+ sudo pip install entrypoint2
Uninstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/SOURCES.txt
new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/SOURCES.txt
--- old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/SOURCES.txt
2012-03-10 19:10:21.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/SOURCES.txt
2012-12-02 18:18:06.000000000 +0100
@@ -28,4 +28,5 @@
pyvirtualdisplay/examples/lowres.py
pyvirtualdisplay/examples/screenshot1.py
pyvirtualdisplay/examples/screenshot3.py
+pyvirtualdisplay/examples/screenshot4.py
pyvirtualdisplay/examples/vncserver.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/requires.txt
new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/requires.txt
--- old/PyVirtualDisplay-0.1.0/PyVirtualDisplay.egg-info/requires.txt
2012-03-10 19:10:21.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/requires.txt
2012-12-02 18:18:06.000000000 +0100
@@ -1,2 +1 @@
-EasyProcess
-entrypoint2
\ No newline at end of file
+EasyProcess
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyVirtualDisplay-0.1.0/README.rst
new/PyVirtualDisplay-0.1.1/README.rst
--- old/PyVirtualDisplay-0.1.0/README.rst 2012-03-10 18:52:46.000000000
+0100
+++ new/PyVirtualDisplay-0.1.1/README.rst 2012-11-22 16:35:02.000000000
+0100
@@ -64,6 +64,8 @@
sudo apt-get install python-imaging
sudo apt-get install scrot
sudo pip install pyscreenshot
+ # optional for examples
+ sudo pip install entrypoint2
Uninstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/__init__.py
new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/__init__.py
--- old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/__init__.py 2012-03-10
18:54:43.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/__init__.py 2012-11-22
16:41:24.000000000 +0100
@@ -1,7 +1,7 @@
from display import Display
import logging
-__version__ = '0.1.0'
+__version__ = '0.1.1'
log = logging.getLogger(__name__)
log.debug('version=' + __version__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/abstractdisplay.py
new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/abstractdisplay.py
--- old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/abstractdisplay.py
2012-03-10 18:47:20.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/abstractdisplay.py
2012-03-10 19:11:55.000000000 +0100
@@ -15,11 +15,6 @@
MIN_DISPLAY_NR = 1000
-def listdir(f, pattern):
- names = os.listdir(self)
- names = fnmatch.filter(names, pattern)
- return [f / child for child in names]
-
class AbstractDisplay(EasyProcess):
'''
Common parent for Xvfb and Xephyr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/examples/screenshot3.py
new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot3.py
--- old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/examples/screenshot3.py
2011-08-03 09:19:09.000000000 +0200
+++ new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot3.py
2012-05-16 18:33:09.000000000 +0200
@@ -1,6 +1,8 @@
'''
using :keyword:`with` statement
'''
+import logging
+logging.basicConfig(level=logging.DEBUG)
from easyprocess import EasyProcess
from pyvirtualdisplay.smartdisplay import SmartDisplay
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/examples/screenshot4.py
new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot4.py
--- old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/examples/screenshot4.py
1970-01-01 01:00:00.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot4.py
2012-11-02 10:03:31.000000000 +0100
@@ -0,0 +1,25 @@
+'''
+two calls
+'''
+import logging
+logging.basicConfig(level=logging.DEBUG)
+
+from easyprocess import EasyProcess
+from pyvirtualdisplay.smartdisplay import SmartDisplay
+
+backend1 = 'wx'
+backend2 = 'wx'
+
+
+with SmartDisplay(visible=0, bgcolor='black') as disp:
+ disp.pyscreenshot_backend = backend1
+ with EasyProcess('xmessage test1'):
+ img1 = disp.waitgrab()
+
+with SmartDisplay(visible=0, bgcolor='black') as disp:
+ disp.pyscreenshot_backend = backend2
+ with EasyProcess('xmessage test2'):
+ img2 = disp.waitgrab()
+
+img1.show()
+img2.show()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/smartdisplay.py
new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/smartdisplay.py
--- old/PyVirtualDisplay-0.1.0/pyvirtualdisplay/smartdisplay.py 2012-02-05
21:55:41.000000000 +0100
+++ new/PyVirtualDisplay-0.1.1/pyvirtualdisplay/smartdisplay.py 2012-11-02
09:55:26.000000000 +0100
@@ -9,13 +9,15 @@
log = logging.getLogger(__name__)
-#class DisplayError(Exception):
+# class DisplayError(Exception):
# pass
class DisplayTimeoutError(Exception):
pass
+
class SmartDisplay(Display):
+ pyscreenshot_backend = None
def autocrop(self, im):
'''Crop borders off an image.
@@ -30,14 +32,20 @@
bbox = diff.getbbox()
if bbox:
return im.crop(bbox)
- return None # no contents
+ return None # no contents
def grab(self, autocrop=True):
- img=pyscreenshot.grab()
+ try:
+ # first try newer pyscreenshot version
+ img = pyscreenshot.grab(childprocess=1,
backend=self.pyscreenshot_backend)
+ except TypeError:
+ # try older pyscreenshot version
+ img = pyscreenshot.grab()
+
if autocrop:
img = self.autocrop(img)
return img
-
+
def waitgrab(self, timeout=60, autocrop=True, cb_imgcheck=None):
'''start process and create screenshot.
Repeat screenshot until it is not empty and
@@ -51,7 +59,7 @@
False = reject img
'''
t = 0
- sleep_time = 0.3 # for fast windows
+ sleep_time = 0.3 # for fast windows
repeat_time = 1
while 1:
log.debug('sleeping %s secs' % str(sleep_time))
@@ -64,25 +72,25 @@
if cb_imgcheck(img):
break
sleep_time = repeat_time
- repeat_time += 1 # progressive
+ repeat_time += 1 # progressive
if t > timeout:
msg = 'Timeout! elapsed time:%s timeout:%s ' % (t, timeout)
- raise DisplayTimeoutError(msg)
+ raise DisplayTimeoutError(msg)
break
-
+
log.debug('screenshot is empty, next try..')
assert img
# if not img:
# log.debug('screenshot is empty!')
return img
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyVirtualDisplay-0.1.0/requirements.txt
new/PyVirtualDisplay-0.1.1/requirements.txt
--- old/PyVirtualDisplay-0.1.0/requirements.txt 2012-03-10 18:03:02.000000000
+0100
+++ new/PyVirtualDisplay-0.1.1/requirements.txt 2012-11-22 16:34:15.000000000
+0100
@@ -1,3 +1,3 @@
EasyProcess
-entrypoint2
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
