commit python-PyVirtualDisplay for openSUSE:Factory
Hello community, here is the log from the commit of package python-PyVirtualDisplay for openSUSE:Factory checked in at 2013-02-17 17:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-01-14 22:25:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-PyVirtualDisplay.new/python-PyVirtualDisplay.changes 2013-02-17 17:13:23.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 17 14:09:21 UTC 2013 - p.drouand@gmail.com + +- Update to version 0.1.1: + * No changelog available + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-PyVirtualDisplay/python3-PyVirtualDisplay.changes 2013-01-14 22:25:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-PyVirtualDisplay.new/python3-PyVirtualDisplay.changes 2013-02-17 17:13:23.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Feb 17 14:09:21 UTC 2013 - p.drouand@gmail.com + +- Update to version 0.1.1: + * No changelog available + +------------------------------------------------------------------- +Mon Jan 14 08:45:51 UTC 2013 - saschpe@suse.de + +- Drop requires on "python(abi)", RPM does that automatically +- No need to buildrequire python3-2to3 anymore, it moved into + python3-devel + +------------------------------------------------------------------- Old: ---- PyVirtualDisplay-0.1.1.tar.gz New: ---- PyVirtualDisplay-0.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyVirtualDisplay.spec ++++++ --- /var/tmp/diff_new_pack.IIJZ7w/_old 2013-02-17 17:13:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IIJZ7w/_new 2013-02-17 17:13:24.000000000 +0100 @@ -11,12 +11,13 @@ # 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: python-PyVirtualDisplay -Version: 0.1.1 +Version: 0.1.2 Release: 0 Url: https://github.com/ponty/PyVirtualDisplay Summary: Python wrapper for Xvfb, Xephyr and Xvnc ++++++ python3-PyVirtualDisplay.spec ++++++ --- /var/tmp/diff_new_pack.IIJZ7w/_old 2013-02-17 17:13:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IIJZ7w/_new 2013-02-17 17:13:24.000000000 +0100 @@ -11,12 +11,13 @@ # 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 +Version: 0.1.2 Release: 0 Url: https://github.com/ponty/PyVirtualDisplay Summary: Python wrapper for Xvfb, Xephyr and Xvnc @@ -25,11 +26,9 @@ 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-0.1.1.tar.gz -> PyVirtualDisplay-0.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/MANIFEST.in new/PyVirtualDisplay-0.1.2/MANIFEST.in --- old/PyVirtualDisplay-0.1.1/MANIFEST.in 2012-12-02 18:18:06.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/MANIFEST.in 2013-02-16 18:35:27.000000000 +0100 @@ -1,4 +1,4 @@ -grant docs +graft docs include LICENSE* include pavement.py include TODO* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/PKG-INFO new/PyVirtualDisplay-0.1.2/PKG-INFO --- old/PyVirtualDisplay-0.1.1/PKG-INFO 2012-12-02 18:18:06.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/PKG-INFO 2013-02-16 18:35:27.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyVirtualDisplay -Version: 0.1.1 +Version: 0.1.2 Summary: python wrapper for Xvfb, Xephyr and Xvnc Home-page: https://github.com/ponty/PyVirtualDisplay Author: ponty @@ -16,8 +16,8 @@ Features: - python wrapper - - back-ends: Xvfb_, Xephyr_, Xvnc_ - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - back-ends: Xvfb_, Xephyr_, Xvnc_ .. warning:: at least one back-end should be installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/PKG-INFO new/PyVirtualDisplay-0.1.2/PyVirtualDisplay.egg-info/PKG-INFO --- old/PyVirtualDisplay-0.1.1/PyVirtualDisplay.egg-info/PKG-INFO 2012-12-02 18:18:06.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/PyVirtualDisplay.egg-info/PKG-INFO 2013-02-16 18:35:27.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyVirtualDisplay -Version: 0.1.1 +Version: 0.1.2 Summary: python wrapper for Xvfb, Xephyr and Xvnc Home-page: https://github.com/ponty/PyVirtualDisplay Author: ponty @@ -16,8 +16,8 @@ Features: - python wrapper - - back-ends: Xvfb_, Xephyr_, Xvnc_ - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - back-ends: Xvfb_, Xephyr_, Xvnc_ .. warning:: at least one back-end should be installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/README.rst new/PyVirtualDisplay-0.1.2/README.rst --- old/PyVirtualDisplay-0.1.1/README.rst 2012-11-22 16:35:02.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/README.rst 2013-02-16 18:34:05.000000000 +0100 @@ -8,8 +8,8 @@ Features: - python wrapper - - back-ends: Xvfb_, Xephyr_, Xvnc_ - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - back-ends: Xvfb_, Xephyr_, Xvnc_ .. warning:: at least one back-end should be installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/docs/conf.py new/PyVirtualDisplay-0.1.2/docs/conf.py --- old/PyVirtualDisplay-0.1.1/docs/conf.py 2012-01-21 20:12:43.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/docs/conf.py 2013-02-16 18:28:23.000000000 +0100 @@ -4,6 +4,7 @@ import sphinx import sys + def read_project_version(py=None, where='.', exclude=['bootstrap', 'pavement', 'doc', 'docs', 'test', 'tests', ]): if not py: py = path(where) / find_packages(where=where, exclude=exclude)[0] @@ -23,18 +24,18 @@ author = 'ponty' copyright = '2011, ponty' -#logging.basicConfig(level=logging.DEBUG) +# logging.basicConfig(level=logging.DEBUG) # Extension extensions = [ - # -*-Extensions: -*- - 'sphinx.ext.autodoc', - 'sphinxcontrib.programoutput', - 'sphinxcontrib.programscreenshot', - 'sphinx.ext.graphviz', - #'sphinx.ext.autosummary', - 'sphinx.ext.intersphinx', - ] + # -*-Extensions: -*- + 'sphinx.ext.autodoc', + 'sphinxcontrib.programoutput', + 'sphinxcontrib.programscreenshot', + 'sphinx.ext.graphviz', + #'sphinx.ext.autosummary', + 'sphinx.ext.intersphinx', +] intersphinx_mapping = {'http://docs.python.org/': None} # Source @@ -54,15 +55,15 @@ # latex build settings latex_documents = [ ('index', '%s.tex' % project, u'%s Documentation' % project, - author, 'manual'), + author, 'manual'), ] # remove blank pages from pdf -# http://groups.google.com/group/sphinx-dev/browse_thread/thread/92e19267d0954... -latex_font_size = '10pt,oneside' - -latex_elements=dict( - papersize='a4paper', - ) - +# http://groups.google.com/group/sphinx- +# dev/browse_thread/thread/92e19267d095412d/d60dcba483c6b13d +latex_font_size = '10pt,oneside' + +latex_elements = dict( + papersize='a4paper', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pavement.py new/PyVirtualDisplay-0.1.2/pavement.py --- old/PyVirtualDisplay-0.1.1/pavement.py 2012-03-09 16:10:20.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pavement.py 2013-02-16 18:28:23.000000000 +0100 @@ -14,7 +14,8 @@ from sphinxcontrib import paverutils # get info from setup.py -setup_py=''.join([x for x in path('setup.py').lines() if 'setuptools' not in x]) +setup_py = ''.join( + [x for x in path('setup.py').lines() if 'setuptools' not in x]) exec(setup_py) @@ -22,25 +23,25 @@ sphinx=Bunch( docroot='docs', builddir="_build", - ), + ), pdf=Bunch( builddir='_build', builder='latex', ), - ) +) -options.paved.clean.rmdirs += ['.tox', - 'dist', - 'build' , - ] +options.paved.clean.rmdirs += ['.tox', + 'dist', + 'build', + ] options.paved.clean.patterns += ['*.pickle', '*.doctree', - '*.gz' , + '*.gz', 'nosetests.xml', 'sloccount.sc', '*.pdf', '*.tex', '*.png', - '*.zip', + '*.zip', 'distribute_setup.py', ] @@ -51,22 +52,24 @@ @task @needs( -# 'clean', - 'sloccount', - 'html', - 'pdf', - 'sdist', - 'nose', 'tox', - ) + # 'clean', + 'sloccount', + 'html', + 'pdf', + 'sdist', + 'nose', 'tox', +) def alltest(): 'all tasks to check' pass + @task @needs('sphinxcontrib.paverutils.html') def html(): pass + @task @needs('sphinxcontrib.paverutils.pdf') def pdf(): @@ -75,16 +78,16 @@ d.makedirs() fpdf.copy(d) + @task def tox(): '''Run tox.''' sh('tox') - + @task @needs('manifest', 'setuptools.command.sdist') def sdist(): """Overrides sdist to make sure that our MANIFEST.in is generated. """ pass - \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/__init__.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/__init__.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/__init__.py 2012-11-22 16:41:24.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/__init__.py 2013-02-16 18:28:23.000000000 +0100 @@ -1,7 +1,7 @@ from display import Display import logging -__version__ = '0.1.1' +__version__ = '0.1.2' log = logging.getLogger(__name__) log.debug('version=' + __version__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/abstractdisplay.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/abstractdisplay.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/abstractdisplay.py 2012-03-10 19:11:55.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/abstractdisplay.py 2013-02-16 18:28:23.000000000 +0100 @@ -14,16 +14,17 @@ random.seed() MIN_DISPLAY_NR = 1000 - + + class AbstractDisplay(EasyProcess): ''' Common parent for Xvfb and Xephyr ''' - + @property def new_display_var(self): return ':%s' % (self.display) - + @property def _cmd(self): raise NotImplementedError() @@ -34,28 +35,29 @@ # ls = path('/tmp').files('.X*-lock') # remove path.py dependency names = fnmatch.filter(os.listdir(tmpdir), pattern) - ls = [os.path.join(tmpdir , child) for child in names] + ls = [os.path.join(tmpdir, child) for child in names] ls = [p for p in ls if os.path.isfile(p)] return ls - + def search_for_display(self): # search for free display - ls = map(lambda x:int(x.split('X')[1].split('-')[0]), self.lock_files()) + ls = map( + lambda x: int(x.split('X')[1].split('-')[0]), self.lock_files()) if len(ls): display = max(MIN_DISPLAY_NR, max(ls) + 1) else: display = MIN_DISPLAY_NR - - if RANDOMIZE_DISPLAY_NR: - display += random.randint(0, 100) + + if RANDOMIZE_DISPLAY_NR: + display += random.randint(0, 100) return display - + def redirect_display(self, on): ''' on: * True -> set $DISPLAY to virtual screen * False -> set $DISPLAY to original screen - + :param on: bool ''' d = self.new_display_var if on else self.old_display_var @@ -65,22 +67,23 @@ def start(self): ''' start display - + :rtype: self ''' self.display = self.search_for_display() EasyProcess.__init__(self, self._cmd) EasyProcess.start(self) - + # https://github.com/ponty/PyVirtualDisplay/issues/2 - self.old_display_var = os.environ['DISPLAY'] if 'DISPLAY' in os.environ else ':0' - + self.old_display_var = os.environ[ + 'DISPLAY'] if 'DISPLAY' in os.environ else ':0' + self.redirect_display(True) # wait until X server is active # TODO: better method time.sleep(0.1) return self - + def stop(self): ''' stop display @@ -90,13 +93,3 @@ self.redirect_display(False) EasyProcess.stop(self) return self - - - - - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/display.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/display.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/display.py 2012-03-10 18:47:08.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/display.py 2013-02-16 18:28:23.000000000 +0100 @@ -7,8 +7,8 @@ class Display(AbstractDisplay): ''' Common class - - :param color_depth: [8, 16, 24, 32] + + :param color_depth: [8, 16, 24, 32] :param size: screen size (width,height) :param bgcolor: background color ['black' or 'white'] :param visible: True -> Xephyr, False -> Xvfb @@ -26,35 +26,32 @@ if not self.backend: if self.visible: - self.backend='xephyr' + self.backend = 'xephyr' else: - self.backend='xvfb' + self.backend = 'xvfb' - self._obj = self.display_class( - size=size, - color_depth=color_depth, - bgcolor=bgcolor, - **kwargs) + self._obj = self.display_class( + size=size, + color_depth=color_depth, + bgcolor=bgcolor, + **kwargs) - @property def display_class(self): assert self.backend - if self.backend=='xvfb': + if self.backend == 'xvfb': cls = XvfbDisplay - if self.backend=='xvnc': + if self.backend == 'xvnc': cls = XvncDisplay - if self.backend=='xephyr': + if self.backend == 'xephyr': cls = XephyrDisplay - + # TODO: check only once cls.check_installed() - + return cls - + @property def _cmd(self): - self._obj.display=self.display + self._obj.display = self.display return self._obj._cmd - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/lowres.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/lowres.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/lowres.py 2012-05-14 10:05:32.000000000 +0200 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/lowres.py 2013-02-16 18:28:23.000000000 +0100 @@ -1,6 +1,5 @@ from easyprocess import EasyProcess from pyvirtualdisplay import Display - + Display(visible=1, size=(320, 240)).start() EasyProcess('gnumeric').start() - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot1.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/screenshot1.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/screenshot1.py 2012-05-14 10:05:32.000000000 +0200 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/screenshot1.py 2013-02-16 18:28:23.000000000 +0100 @@ -7,4 +7,3 @@ xmessage.stop() disp.stop() img.show() - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/vncserver.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/vncserver.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/examples/vncserver.py 2011-08-08 12:19:37.000000000 +0200 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/examples/vncserver.py 2013-02-16 18:28:23.000000000 +0100 @@ -6,6 +6,7 @@ from entrypoint2 import entrypoint from pyvirtualdisplay.display import Display + @entrypoint def main(rfbport=5904): with Display(backend='xvnc', rfbport=rfbport) as disp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/smartdisplay.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/smartdisplay.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/smartdisplay.py 2012-11-02 09:55:26.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/smartdisplay.py 2013-02-16 18:28:23.000000000 +0100 @@ -1,6 +1,6 @@ from pyvirtualdisplay.display import Display -import Image -import ImageChops +from PIL import Image +from PIL import ImageChops import logging import pyscreenshot import time @@ -18,9 +18,11 @@ class SmartDisplay(Display): pyscreenshot_backend = None + pyscreenshot_childprocess = False + def autocrop(self, im): '''Crop borders off an image. - + :param im: Source image. :param bgcolor: Background color, using either a color tuple or a color name (1.1.4 only). :return: An image without borders, or None if there's no actual content in the image. @@ -37,7 +39,10 @@ def grab(self, autocrop=True): try: # first try newer pyscreenshot version - img = pyscreenshot.grab(childprocess=1, backend=self.pyscreenshot_backend) + img = pyscreenshot.grab( + childprocess=self.pyscreenshot_childprocess, + backend=self.pyscreenshot_backend, + ) except TypeError: # try older pyscreenshot version img = pyscreenshot.grab() @@ -48,14 +53,14 @@ def waitgrab(self, timeout=60, autocrop=True, cb_imgcheck=None): '''start process and create screenshot. - Repeat screenshot until it is not empty and - cb_imgcheck callback function returns True + Repeat screenshot until it is not empty and + cb_imgcheck callback function returns True for current screenshot. - - :param autocrop: True -> crop screenshot - :param timeout: int - :param cb_imgcheck: None or callback for testing img, - True = accept img, + + :param autocrop: True -> crop screenshot + :param timeout: int + :param cb_imgcheck: None or callback for testing img, + True = accept img, False = reject img ''' t = 0 @@ -83,14 +88,3 @@ # if not img: # log.debug('screenshot is empty!') return img - - - - - - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xephyr.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xephyr.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xephyr.py 2012-03-10 18:45:01.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xephyr.py 2013-02-16 18:28:23.000000000 +0100 @@ -5,10 +5,11 @@ URL = None PACKAGE = 'xephyr' + class XephyrDisplay(AbstractDisplay): ''' Xephyr wrapper - + Xephyr is an X server outputting to a window on a pre-existing X display ''' def __init__(self, size=(1024, 768), color_depth=24, bgcolor='black'): @@ -24,15 +25,15 @@ @classmethod def check_installed(cls): - EasyProcess([PROGRAM, '-help'], url=URL, ubuntu_package=PACKAGE).check_installed() + EasyProcess([PROGRAM, '-help'], url=URL, + ubuntu_package=PACKAGE).check_installed() @property def _cmd(self): - cmd = [PROGRAM , + cmd = [PROGRAM, dict(black='-br', white='-wr')[self.bgcolor], - '-screen', - 'x'.join(map(str, list(self.size) + [self.color_depth])), - self.new_display_var, - ] + '-screen', + 'x'.join(map(str, list(self.size) + [self.color_depth])), + self.new_display_var, + ] return cmd - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xvfb.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xvfb.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xvfb.py 2012-03-10 18:45:01.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xvfb.py 2013-02-16 18:28:23.000000000 +0100 @@ -12,7 +12,7 @@ class XvfbDisplay(AbstractDisplay): ''' Xvfb wrapper - + Xvfb is an X server that can run on machines with no display hardware and no physical input devices. It emulates a dumb framebuffer using virtual memory. @@ -27,23 +27,19 @@ self.process = None self.bgcolor = bgcolor self.display = None - + @classmethod def check_installed(cls): - EasyProcess([PROGRAM, '-help'], url=URL, ubuntu_package=PACKAGE).check_installed() - + EasyProcess([PROGRAM, '-help'], url=URL, + ubuntu_package=PACKAGE).check_installed() + @property def _cmd(self): - cmd = [PROGRAM , + cmd = [PROGRAM, dict(black='-br', white='-wr')[self.bgcolor], - '-screen', - str(self.screen), - 'x'.join(map(str, list(self.size) + [self.color_depth])), - self.new_display_var, - ] + '-screen', + str(self.screen), + 'x'.join(map(str, list(self.size) + [self.color_depth])), + self.new_display_var, + ] return cmd - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xvnc.py new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xvnc.py --- old/PyVirtualDisplay-0.1.1/pyvirtualdisplay/xvnc.py 2012-03-10 18:45:02.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/pyvirtualdisplay/xvnc.py 2013-02-16 18:28:23.000000000 +0100 @@ -8,6 +8,7 @@ URL = None PACKAGE = 'tightvncserver' + class XvncDisplay(AbstractDisplay): ''' Xvnc wrapper @@ -15,7 +16,7 @@ def __init__(self, size=(1024, 768), color_depth=24, bgcolor='black', rfbport=5900): ''' :param bgcolor: 'black' or 'white' - :param rfbport: Specifies the TCP port on which Xvnc listens for connections from viewers (the protocol used in VNC is called RFB - "remote framebuffer"). The default is 5900 plus the display number. + :param rfbport: Specifies the TCP port on which Xvnc listens for connections from viewers (the protocol used in VNC is called RFB - "remote framebuffer"). The default is 5900 plus the display number. ''' self.screen = 0 self.size = size @@ -24,24 +25,20 @@ self.bgcolor = bgcolor self.display = None self.rfbport = rfbport - + @classmethod def check_installed(cls): - EasyProcess([PROGRAM, '-help'], url=URL, ubuntu_package=PACKAGE).check_installed() - + EasyProcess([PROGRAM, '-help'], url=URL, + ubuntu_package=PACKAGE).check_installed() + @property def _cmd(self): - cmd = [PROGRAM , -# dict(black='-br', white='-wr')[self.bgcolor], -# '-screen', -# str(self.screen), -# 'x'.join(map(str, list(self.size) + [self.color_depth])), - '-rfbport', self.rfbport, - self.new_display_var, - ] + cmd = [PROGRAM, + # dict(black='-br', white='-wr')[self.bgcolor], + # '-screen', + # str(self.screen), + # 'x'.join(map(str, list(self.size) + [self.color_depth])), + '-rfbport', self.rfbport, + self.new_display_var, + ] return cmd - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyVirtualDisplay-0.1.1/setup.py new/PyVirtualDisplay-0.1.2/setup.py --- old/PyVirtualDisplay-0.1.1/setup.py 2012-03-09 16:36:35.000000000 +0100 +++ new/PyVirtualDisplay-0.1.2/setup.py 2013-02-16 18:28:23.000000000 +0100 @@ -4,7 +4,7 @@ def read_project_version(package): - py = os.path.join(package , '__init__.py') + py = os.path.join(package, '__init__.py') __version__ = None for line in open(py).read().splitlines(): if '__version__' in line: @@ -12,7 +12,7 @@ break return __version__ -PACKAGE='pyvirtualdisplay' +PACKAGE = 'pyvirtualdisplay' NAME = 'PyVirtualDisplay' URL = 'https://github.com/ponty/PyVirtualDisplay' DESCRIPTION = 'python wrapper for Xvfb, Xephyr and Xvnc' @@ -23,12 +23,13 @@ extra['use_2to3'] = True classifiers = [ - # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers + # Get more strings from + # http://www.python.org/pypi?%3Aaction=list_classifiers "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python", - ] +] install_requires = open("requirements.txt").read().split('\n') @@ -41,7 +42,7 @@ classifiers=classifiers, keywords='Xvfb Xephyr X wrapper', author='ponty', - #author_email='', + # author_email='', url=URL, license='BSD', packages=find_packages(exclude=['bootstrap', 'pavement', ]), @@ -50,5 +51,4 @@ zip_safe=False, install_requires=install_requires, **extra - ) - +) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de