Hello community,
here is the log from the commit of package python-distutils-extra for openSUSE:Factory
checked in at Tue Nov 2 13:52:32 CET 2010.
--------
--- python-distutils-extra/python-distutils-extra.changes 2010-04-02 03:41:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/python-distutils-extra/python-distutils-extra.changes 2010-10-30 10:33:43.000000000 +0200
@@ -1,0 +2,80 @@
+Sat Oct 30 08:22:11 UTC 2010 - rwobben@hotmail.com
+
+- Update to version 2.22 ( 2.6 is not the latest one)
+
+
+Changelog to 2.22
+
+* setup.py: Drop import of "commands"; unused, and does not exist in
+ python3.
+ * DistUtilsExtra/command/build_extra.py: Use "in" operator instead of
+ has_key(). It's more elegant and Python 3 compatible.
+ * test/auto.py: Use Python3 compatible octal constant.
+ * test/auto.py: Decode stdout/stderr result from subprocess from bytes to
+ str, to work with Python3.
+ * test/auto.py: Use whichever Python interpreter we got invoked with (using
+ /proc/self/exe) instead of hardcoding "python". With that we can run the
+ tests through python3 as well.
+ * DistUtilsExtra/auto.py: Port from deprecated "compiler" module to current
+ "ast" module.
+ * test/auto.py: Only set PYTHONPATH if it isn't set already, so that we can
+ override it from outside.
+ * test/auto.py: Do not require that "setup.py clean -a" doesn't print
+ anything to stderr; with Python 3.1 it now sends out warnings about
+ nonexisting directories.
+ * test/auto.py: Changed print statements to work with both Python 2 and 3.
+ * DistUtilsExtra/command/build_extra.py: Drop unnecessary hashbang line.
+ * test/auto.py: Filter out bogus errors about missing files which current
+ Python 3 distutils spews out.
+ * test/auto.py, Use python{,3}-{pkg-resources,httplib2} as
+ external test modules instead of -xdg and -dateutil, since the latter are
+ not available for Python 3 yet.
+
+Changelog to 2.20
+
+ [Didier Roche ]
+ * build_i18n.py: add support for LINGUAS (Siegfried Gevatter) (LP: #510957)
+
+[ Martin Pitt ]
+* debian/local/python-mkdebian: Make langpack.mk include optional, as it
+ only exists in Ubuntu, not Debian. (Closes: #589802)
+* debian/local/python-mkdebian: If we are on Debian, set upload target to
+ "unstable". (Closes: #589794)
+
+changelog to 2.19
+
+ * auto.py: Also recognize Qt .ui files if they start with an "http://launchpad.net/python-distutils-extra/trunk/%{version}/+download/python-distutils-extra-%{version}.tar.gz
++++++ python-distutils-extra-2.18.tar.gz -> python-distutils-extra-2.22.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.18/DistUtilsExtra/auto.py new/python-distutils-extra-2.22/DistUtilsExtra/auto.py
--- old/python-distutils-extra-2.18/DistUtilsExtra/auto.py 2010-03-24 09:45:52.000000000 +0100
+++ new/python-distutils-extra-2.22/DistUtilsExtra/auto.py 2010-09-16 19:31:55.000000000 +0200
@@ -34,15 +34,14 @@
author, license, etc.) in ./setup.py.
'''
-__version__ = '2.18'
-
# (c) 2009 Canonical Ltd.
# Author: Martin Pitt
import os, os.path, fnmatch, stat, sys, subprocess
-import compiler # TODO: deprecated
+import ast
import distutils.core
+from DistUtilsExtra import __version__ as __pkgversion
from DistUtilsExtra.command import *
import distutils.dir_util
import distutils.command.clean
@@ -50,6 +49,8 @@
import distutils.command.install
import distutils.filelist
+__version__ = __pkgversion
+
# FIXME: global variable, to share with build_i18n_auto
src = {}
src_all = {}
@@ -329,16 +330,16 @@
This filters out modules which are shipped with Python itself.
'''
try:
- ast = compiler.parseFile(file)
+ tree = ast.parse(open(file).read(), file)
- for node in ast.node.nodes:
- if isinstance(node, compiler.ast.Import):
- for name, _ in node.names:
- if __external_mod(name, attrs):
- imports.add(name)
- if isinstance(node, compiler.ast.From):
- if __external_mod(node.modname, attrs):
- imports.add(node.modname)
+ for node in ast.walk(tree):
+ if isinstance(node, ast.Import):
+ for alias in node.names:
+ if __external_mod(alias.name, attrs):
+ imports.add(alias.name)
+ if isinstance(node, ast.ImportFrom):
+ if __external_mod(node.module, attrs):
+ imports.add(node.module)
except SyntaxError, e:
print >> sys.stderr, 'WARNING: syntax errors in', file, ':', e
@@ -557,7 +558,7 @@
# find extensionless executable scripts which are Python files, and
# generate a temporary *.py alias, so that they get caught by
# intltool
- for f in src_all:
+ for f in reduce(lambda x, y: x.union(y[1]), self.distribution.data_files, src_all):
f_py = f + '.py'
if os.access(f, os.X_OK) and os.path.splitext(f)[1] == '' and \
not os.path.exists(f_py):
@@ -597,9 +598,13 @@
# add *.ui files which belong to KDE4
kdeui_files = []
for f in src_fileglob(src, '*.ui'):
- if open(f).readline().startswith('> f, 'dummy'
+ f.write('dummy')
else:
- print >> f, content
+ f.write(content + '\n')
f.close()
if executable:
- os.chmod(path, 0755)
+ os.chmod(path, 0o755)
def do_snapshot(self):
'''Snapshot source tree.
@@ -783,7 +833,8 @@
diff = subprocess.Popen(['diff', '-x', 'foo.pot', '-Nur', os.path.join(self.snapshot, 's'),
self.src], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = diff.communicate()
- self.assertEqual(err, '', 'diff error messages')
+ out = out.decode()
+ self.assertEqual(err, b'', 'diff error messages')
return out
def _mkpo(self):
@@ -807,26 +858,26 @@
def _mk_i18n_source(self):
'''Create some example source files with gettext calls'''
- self._mksrc('gtk/main.py', '''print _("yes1")
-print "no1"
-print __("no2")
+ self._mksrc('gtk/main.py', '''print (_("yes1"))
+print ("no1")
+print (__("no2"))
x = _('yes2 %s') % y
def f():
- print _(u"yes3")
- return _(u'yes6')''')
+ print (_("yes3"))
+ return _('yes6')''')
self._mksrc('helpers.py', '''
-print f(_(u"yes4"))
-print _(\'\'\'yes5
+print (f(_("yes4")))
+print (_(\'\'\'yes5
even more
-lines\'\'\')
-print _("""yes6
-more lines""")
-print \'\'\'no3
-boo\'\'\'
-print """no4
-more"""''')
+lines\'\'\'))
+print (_("""yes6
+more lines"""))
+print (\'\'\'no3
+boo\'\'\')
+print ("""no4
+more""")''')
self._mksrc('gui/foo.desktop.in', '''[Desktop Entry]
_Name=yes7
@@ -869,9 +920,9 @@
self._mksrc('Makefile', 'echo _("no7")')
# Executables without *.py extension
- self._mksrc('gtk/foo-gtk', '#!/usr/bin/python\nprint _("yes13")',
+ self._mksrc('gtk/foo-gtk', '#!/usr/bin/python\nprint (_("yes13"))',
executable=True)
- self._mksrc('cli/foo-cli', '#!/usr/bin/env python\nprint _("yes14")',
+ self._mksrc('cli/foo-cli', '#!/usr/bin/env python\nprint (_(\'yes14\'))',
executable=True)
self._mksrc('daemon/foobarize', '#!/usr/bin/flex\np _("no8")',
executable=True)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org