Hello community, here is the log from the commit of package python-djvulibre for openSUSE:Factory checked in at 2012-03-29 14:04:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-djvulibre (Old) and /work/SRC/openSUSE:Factory/.python-djvulibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-djvulibre", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-djvulibre/python-djvulibre.changes 2012-03-12 20:16:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-djvulibre.new/python-djvulibre.changes 2012-03-29 14:04:47.000000000 +0200 @@ -1,0 +2,28 @@ +Tue Mar 20 16:07:07 UTC 2012 - [email protected] + +- Update to 0.3.9. + * Ensure that all S-expression output is 7-bit. + This is work-around for deb#664626. + +------------------------------------------------------------------- +Mon Mar 19 06:41:42 UTC 2012 - [email protected] + +- Update to 0.3.8. + * Ensure that S-expression input/output functions are always + initialized. + This is work-around for deb#664442. + +------------------------------------------------------------------- +Wed Mar 14 14:30:06 UTC 2012 - [email protected] + +- Update to 0.3.7. + * Use floor division operator instead of relying on "classic" + division semantics. + +------------------------------------------------------------------- +Mon Mar 12 10:49:12 UTC 2012 - [email protected] + +- license update: GPL-2.0+ + No indication of GPL-2.0 (i.e. only) licenses in the package + +------------------------------------------------------------------- @@ -60 +87,0 @@ - Old: ---- python-djvulibre-0.3.6.tar.gz New: ---- python-djvulibre-0.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-djvulibre.spec ++++++ --- /var/tmp/diff_new_pack.cnWOKi/_old 2012-03-29 14:04:50.000000000 +0200 +++ /var/tmp/diff_new_pack.cnWOKi/_new 2012-03-29 14:04:50.000000000 +0200 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-djvulibre -Version: 0.3.6 +Version: 0.3.9 Release: 0 -License: GPL-2.0 Summary: Python Support for the DjVu Image Format -Url: http://jwilk.net/software/python-djvulibre +License: GPL-2.0+ Group: Development/Libraries/Python +Url: http://jwilk.net/software/python-djvulibre Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz BuildRequires: graphviz BuildRequires: graphviz-gnome ++++++ python-djvulibre-0.3.6.tar.gz -> python-djvulibre-0.3.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/PKG-INFO new/python-djvulibre-0.3.9/PKG-INFO --- old/python-djvulibre-0.3.6/PKG-INFO 2012-03-06 00:18:07.000000000 +0100 +++ new/python-djvulibre-0.3.9/PKG-INFO 2012-03-19 21:02:31.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-djvulibre -Version: 0.3.6 +Version: 0.3.9 Summary: Python support for the DjVu image format Home-page: http://jwilk.net/software/python-djvulibre Author: Jakub Wilk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/djvu/common.pxi new/python-djvulibre-0.3.9/djvu/common.pxi --- old/python-djvulibre-0.3.6/djvu/common.pxi 2012-03-05 23:50:02.000000000 +0100 +++ new/python-djvulibre-0.3.9/djvu/common.pxi 2012-03-18 23:19:50.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> +# Copyright © 2008-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/djvu/const.py new/python-djvulibre-0.3.9/djvu/const.py --- old/python-djvulibre-0.3.6/djvu/const.py 2011-01-18 19:15:30.000000000 +0100 +++ new/python-djvulibre-0.3.9/djvu/const.py 2012-03-18 23:23:48.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2010 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/djvu/decode.pyx new/python-djvulibre-0.3.9/djvu/decode.pyx --- old/python-djvulibre-0.3.6/djvu/decode.pyx 2012-01-30 20:58:13.000000000 +0100 +++ new/python-djvulibre-0.3.9/djvu/decode.pyx 2012-03-18 23:18:33.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2007, 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> +# Copyright © 2007-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1920,7 +1920,7 @@ row_size = row_size * (bpp >> 3) else: raise SystemError - result = ((row_size + (row_alignment - 1)) / row_alignment) * row_alignment + result = ((row_size + (row_alignment - 1)) // row_alignment) * row_alignment return result cdef object allocate_image_memory(long width, long height, object buffer, void **memory): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/djvu/dllpath.py new/python-djvulibre-0.3.9/djvu/dllpath.py --- old/python-djvulibre-0.3.6/djvu/dllpath.py 2011-04-07 18:39:53.000000000 +0200 +++ new/python-djvulibre-0.3.9/djvu/dllpath.py 2012-03-18 23:24:28.000000000 +0100 @@ -1,4 +1,5 @@ # encoding=UTF-8 + # Copyright © 2011 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/djvu/sexpr.pyx new/python-djvulibre-0.3.9/djvu/sexpr.pyx --- old/python-djvulibre-0.3.6/djvu/sexpr.pyx 2011-04-07 18:39:57.000000000 +0200 +++ new/python-djvulibre-0.3.9/djvu/sexpr.pyx 2012-03-19 14:30:42.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2007, 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> +# Copyright © 2007-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ void cvar_free 'minivar_free'(cvar_t* v) nogil cexpr_t* cvar_ptr 'minivar_pointer'(cvar_t* v) nogil + int io_7bit 'minilisp_print_7bits' int (*io_puts 'minilisp_puts')(char *s) int (*io_getc 'minilisp_getc')() int (*io_ungetc 'minilisp_ungetc')(int c) @@ -89,6 +90,10 @@ cdef int _myio_stdout_binary cdef object _myio_buffer _myio_buffer = [] +cdef int _backup_io_7bit +cdef int (*_backup_io_puts)(char *s) +cdef int (*_backup_io_getc)() +cdef int (*_backup_io_ungetc)(int c) cdef object write_unraisable_exception(object cause): message = format_exc() @@ -96,9 +101,14 @@ cdef void myio_set(stdin, stdout): global _myio_stdin, _myio_stdout, _myio_stdout_binary, _myio_buffer - global io_puts, io_getc, io_ungetc + global _backup_io_7bit, _backup_io_puts, _backup_io_getc, _backup_io_ungetc + global io_7bit, io_puts, io_getc, io_ungetc cdef int opt_stdin, opt_stdout with nogil: acquire_lock(_myio_lock, WAIT_LOCK) + _backup_io_7bit = io_7bit + _backup_io_puts = io_puts + _backup_io_getc = io_getc + _backup_io_ungetc = io_ungetc _myio_stdin = stdin IF PY3K: # TODO @@ -126,18 +136,20 @@ pass # TODO else: io_puts = _myio_puts + io_7bit = 1 _myio_buffer = [] cdef void myio_reset(): global _myio_stdin, _myio_stdout, _myio_stdout_binary, _myio_buffer - global io_puts, io_getc, io_ungetc + global io_7bit, io_puts, io_getc, io_ungetc _myio_stdin = None _myio_stdout = None _myio_stdout_binary = 0 _myio_buffer = None - io_puts = NULL - io_getc = NULL - io_ungetc = NULL + io_7bit = _backup_io_7bit + io_puts = _backup_io_puts + io_getc = _backup_io_getc + io_ungetc = _backup_io_ungetc release_lock(_myio_lock) cdef int _myio_puts(char *s): @@ -176,10 +188,6 @@ global _myio_buffer _myio_buffer += (c,) -io_puts = NULL -io_getc = NULL -io_ungetc = NULL - cdef object the_sentinel the_sentinel = object() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/doc/changelog new/python-djvulibre-0.3.9/doc/changelog --- old/python-djvulibre-0.3.6/doc/changelog 2012-03-06 00:14:59.000000000 +0100 +++ new/python-djvulibre-0.3.9/doc/changelog 2012-03-19 20:41:55.000000000 +0100 @@ -1,3 +1,24 @@ +python-djvulibre (0.3.9) unstable; urgency=low + + * Ensure that all S-expression output is 7-bit. + This is work-around for <http://bugs.debian.org/664626>. + + -- Jakub Wilk <[email protected]> Mon, 19 Mar 2012 20:41:53 +0100 + +python-djvulibre (0.3.8) unstable; urgency=low + + * Ensure that S-expression input/output functions are always initialized. + This is work-around for <http://bugs.debian.org/664442>. + + -- Jakub Wilk <[email protected]> Sun, 18 Mar 2012 23:44:55 +0100 + +python-djvulibre (0.3.7) unstable; urgency=low + + * Use floor division operator instead of relying on “classic” division + semantics. + + -- Jakub Wilk <[email protected]> Wed, 14 Mar 2012 08:32:35 +0100 + python-djvulibre (0.3.6) unstable; urgency=low * Improve test suite: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/doc/source/conf.py new/python-djvulibre-0.3.9/doc/source/conf.py --- old/python-djvulibre-0.3.6/doc/source/conf.py 2012-02-16 17:37:49.000000000 +0100 +++ new/python-djvulibre-0.3.9/doc/source/conf.py 2012-03-18 23:28:16.000000000 +0100 @@ -1,6 +1,5 @@ # encoding=UTF-8 -import sys import os import codecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/examples/djvu-crop-text new/python-djvulibre-0.3.9/examples/djvu-crop-text --- old/python-djvulibre-0.3.6/examples/djvu-crop-text 2010-10-07 18:09:53.000000000 +0200 +++ new/python-djvulibre-0.3.9/examples/djvu-crop-text 2012-03-18 23:22:19.000000000 +0100 @@ -1,6 +1,7 @@ #!/usr/bin/python # encoding=UTF-8 -# Copyright © 2008, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2010 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/examples/djvu-dump-text new/python-djvulibre-0.3.9/examples/djvu-dump-text --- old/python-djvulibre-0.3.6/examples/djvu-dump-text 2010-10-07 17:57:18.000000000 +0200 +++ new/python-djvulibre-0.3.9/examples/djvu-dump-text 2012-03-18 23:22:59.000000000 +0100 @@ -1,6 +1,7 @@ #!/usr/bin/python # encoding=UTF-8 -# Copyright © 2008, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2010 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/examples/djvu2png new/python-djvulibre-0.3.9/examples/djvu2png --- old/python-djvulibre-0.3.6/examples/djvu2png 2010-11-04 15:49:56.000000000 +0100 +++ new/python-djvulibre-0.3.9/examples/djvu2png 2012-03-18 23:25:09.000000000 +0100 @@ -1,5 +1,6 @@ #!/usr/bin/python # encoding=UTF-8 + # Copyright © 2010 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/python_djvulibre.egg-info/PKG-INFO new/python-djvulibre-0.3.9/python_djvulibre.egg-info/PKG-INFO --- old/python-djvulibre-0.3.6/python_djvulibre.egg-info/PKG-INFO 2012-03-06 00:18:07.000000000 +0100 +++ new/python-djvulibre-0.3.9/python_djvulibre.egg-info/PKG-INFO 2012-03-19 21:02:31.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-djvulibre -Version: 0.3.6 +Version: 0.3.9 Summary: Python support for the DjVu image format Home-page: http://jwilk.net/software/python-djvulibre Author: Jakub Wilk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/setup.py new/python-djvulibre-0.3.9/setup.py --- old/python-djvulibre-0.3.6/setup.py 2012-02-18 21:40:15.000000000 +0100 +++ new/python-djvulibre-0.3.9/setup.py 2012-03-18 23:27:27.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2007, 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> + +# Copyright © 2007-2011 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -152,8 +153,6 @@ self.build_extension(ext) def cython_sources(self, ext): - targets = {} - deps = [] for source in ext.sources: assert source.endswith('.pyx') target = '%s.c' % source[:-4] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/tests/common.py new/python-djvulibre-0.3.9/tests/common.py --- old/python-djvulibre-0.3.6/tests/common.py 2012-03-05 23:52:27.000000000 +0100 +++ new/python-djvulibre-0.3.9/tests/common.py 2012-03-19 20:38:40.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2010, 2011, 2012 Jakub Wilk <[email protected]> + +# Copyright © 2010-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,12 +19,22 @@ import re import subprocess as ipc import sys -import traceback from nose.tools import * from nose import SkipTest try: + assert_multi_line_equal +except NameError: + assert_multi_line_equal = assert_equal +else: + try: + assert_multi_line_equal.im_class.maxDiff = None + except AttributeError: + pass + # FIXME: How to do it Python 3? + +try: locale.LC_MESSAGES except AttributeError: # A non-POSIX system. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/tests/sexpr-gc.py new/python-djvulibre-0.3.9/tests/sexpr-gc.py --- old/python-djvulibre-0.3.6/tests/sexpr-gc.py 2011-04-07 18:40:11.000000000 +0200 +++ new/python-djvulibre-0.3.9/tests/sexpr-gc.py 2012-03-18 23:30:42.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2007, 2008, 2011 Jakub Wilk <[email protected]> + +# Copyright © 2007-2011 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +16,6 @@ from djvu.sexpr import * from os import getpid -import gc PROC_STATUS = '/proc/%d/status' % getpid() SCALE = dict(kB = 1024.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/tests/test_const.py new/python-djvulibre-0.3.9/tests/test_const.py --- old/python-djvulibre-0.3.6/tests/test_const.py 2010-10-25 22:36:41.000000000 +0200 +++ new/python-djvulibre-0.3.9/tests/test_const.py 2012-03-18 23:22:35.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/tests/test_decode.py new/python-djvulibre-0.3.9/tests/test_decode.py --- old/python-djvulibre-0.3.6/tests/test_decode.py 2012-02-18 21:00:34.000000000 +0100 +++ new/python-djvulibre-0.3.9/tests/test_decode.py 2012-03-19 15:27:22.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2007, 2008, 2009, 2010, 2011, 2012 Jakub Wilk <[email protected]> + +# Copyright © 2007-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +17,6 @@ import os import shutil import subprocess as ipc -import sys import tempfile from djvu.decode import * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-djvulibre-0.3.6/tests/test_sexpr.py new/python-djvulibre-0.3.9/tests/test_sexpr.py --- old/python-djvulibre-0.3.6/tests/test_sexpr.py 2012-03-05 23:18:43.000000000 +0100 +++ new/python-djvulibre-0.3.9/tests/test_sexpr.py 2012-03-19 20:40:14.000000000 +0100 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2007, 2008, 2010, 2011 Jakub Wilk <[email protected]> + +# Copyright © 2007-2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -385,6 +386,11 @@ x = Expression(lst) assert_pickle_equal(x) +def strip_line_numbers_from_traceback(s): + s = re.sub('(?<=[.]c):[0-9]+(?=[)])', '', s) + s = re.sub(', line [0-9]+(?=, )', '', s) + return s + class test_expression_parser(): def test_badstring(self): @@ -399,11 +405,11 @@ with interim(sys, stderr=stderr): with raises(ExpressionSyntaxError): Expression.from_stream(42) - stderr = re.sub(':[0-9]+', '', stderr.getvalue()) - assert_equal(stderr, '''\ + stderr = strip_line_numbers_from_traceback(stderr.getvalue()) + assert_multi_line_equal(stderr, '''\ Unhandled exception (42) Traceback (most recent call last): - File "sexpr.pyx", line 160, in djvu.sexpr._myio_getc (djvu/sexpr.c) + File "sexpr.pyx", in djvu.sexpr._myio_getc (djvu/sexpr.c) AttributeError: 'int' object has no attribute 'read' ''') @@ -454,26 +460,27 @@ class test_expression_writer(): expr = Expression([Symbol('eggs'), Symbol('ham')]) + repr = '(eggs ham)' def test_bad_io(self): stderr = StringIO() with interim(sys, stderr=stderr): self.expr.print_into(42) - stderr = re.sub(':[0-9]+', '', stderr.getvalue()) + stderr = strip_line_numbers_from_traceback(stderr.getvalue()) expected_stderr = '''\ Unhandled exception (42) Traceback (most recent call last): - File "sexpr.pyx", line 146, in djvu.sexpr._myio_puts (djvu/sexpr.c) + File "sexpr.pyx", in djvu.sexpr._myio_puts (djvu/sexpr.c) AttributeError: 'int' object has no attribute 'write' ''' expected_stderr *= len(stderr) // len(expected_stderr) - assert_equal(stderr, expected_stderr) + assert_multi_line_equal(stderr, expected_stderr) def test_stringio(self): fp = StringIO() self.expr.print_into(fp) - assert_equal(fp.getvalue(), '(eggs ham)') + assert_equal(fp.getvalue(), self.repr) def test_fileio_text(self): fp = tempfile.TemporaryFile(mode='w+t') @@ -481,7 +488,7 @@ assert_equal(type(fp), file) self.expr.print_into(fp) fp.seek(0) - assert_equal(fp.read(), '(eggs ham)') + assert_equal(fp.read(), self.repr) def test_fileio_binary(self): fp = tempfile.TemporaryFile(mode='w+b') @@ -489,6 +496,11 @@ assert_equal(type(fp), file) self.expr.print_into(fp) fp.seek(0) - assert_equal(fp.read(), b('(eggs ham)')) + assert_equal(fp.read(), b(self.repr)) + +class test_expression_writer_nonascii(test_expression_writer): + + expr = Expression(u('żółw')) + repr = r'"\305\274\303\263\305\202w"' # vim:ts=4 sw=4 et -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
