Hello community, here is the log from the commit of package python-Tempita for openSUSE:Factory checked in at 2016-11-15 18:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Tempita (Old) and /work/SRC/openSUSE:Factory/.python-Tempita.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Tempita" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Tempita/python-Tempita.changes 2013-10-25 11:33:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Tempita.new/python-Tempita.changes 2016-11-15 18:02:39.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 15 10:32:59 UTC 2016 - dmuel...@suse.com + +- update to 0.5.2 + +------------------------------------------------------------------- Old: ---- Tempita-0.5.1.tar.gz New: ---- Tempita-0.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Tempita.spec ++++++ --- /var/tmp/diff_new_pack.sbr1Td/_old 2016-11-15 18:02:40.000000000 +0100 +++ /var/tmp/diff_new_pack.sbr1Td/_new 2016-11-15 18:02:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Tempita # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-Tempita -Version: 0.5.1 +Version: 0.5.2 Release: 0 Url: http://pythonpaste.org/tempita/ Summary: A very small text templating language License: MIT Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/T/Tempita/Tempita-%{version}.tar.gz +Source: https://pypi.io/packages/source/T/Tempita/Tempita-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-setuptools ++++++ Tempita-0.5.1.tar.gz -> Tempita-0.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/PKG-INFO new/Tempita-0.5.2/PKG-INFO --- old/Tempita-0.5.1/PKG-INFO 2011-06-13 17:42:48.000000000 +0200 +++ new/Tempita-0.5.2/PKG-INFO 2013-12-17 05:07:49.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: Tempita -Version: 0.5.1 +Version: 0.5.2 Summary: A very small text templating language Home-page: http://pythonpaste.org/tempita/ Author: Ian Bicking @@ -18,10 +18,6 @@ <http://pythonpaste.org/tempita/#the-interface>`_, and there's nothing more to learn about it. - You can install from the `svn repository - <http://svn.pythonpaste.org/Tempita/trunk#Tempita-dev>`__ with - ``easy_install Tempita==dev``. - Keywords: templating template language html Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/Tempita.egg-info/PKG-INFO new/Tempita-0.5.2/Tempita.egg-info/PKG-INFO --- old/Tempita-0.5.1/Tempita.egg-info/PKG-INFO 2011-06-13 17:42:47.000000000 +0200 +++ new/Tempita-0.5.2/Tempita.egg-info/PKG-INFO 2013-12-17 05:07:49.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: Tempita -Version: 0.5.1 +Version: 0.5.2 Summary: A very small text templating language Home-page: http://pythonpaste.org/tempita/ Author: Ian Bicking @@ -18,10 +18,6 @@ <http://pythonpaste.org/tempita/#the-interface>`_, and there's nothing more to learn about it. - You can install from the `svn repository - <http://svn.pythonpaste.org/Tempita/trunk#Tempita-dev>`__ with - ``easy_install Tempita==dev``. - Keywords: templating template language html Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/Tempita.egg-info/SOURCES.txt new/Tempita-0.5.2/Tempita.egg-info/SOURCES.txt --- old/Tempita-0.5.1/Tempita.egg-info/SOURCES.txt 2011-06-13 17:42:48.000000000 +0200 +++ new/Tempita-0.5.2/Tempita.egg-info/SOURCES.txt 2013-12-17 05:07:49.000000000 +0100 @@ -6,5 +6,6 @@ Tempita.egg-info/top_level.txt Tempita.egg-info/zip-safe tempita/__init__.py +tempita/__main__.py tempita/_looper.py tempita/compat3.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/setup.cfg new/Tempita-0.5.2/setup.cfg --- old/Tempita-0.5.1/setup.cfg 2011-06-13 17:42:48.000000000 +0200 +++ new/Tempita-0.5.2/setup.cfg 2013-12-17 05:07:49.000000000 +0100 @@ -1,20 +1,13 @@ -[egg_info] -tag_build = -tag_date = 0 -tag_svn_revision = 0 - [global] command_packages = buildutils.pudge_command, buildutils.publish_command -[nosetests] -doctest-extension = txt -with-doctest = 1 - -[publish] -doc-dest = scp://i...@webwareforpython.org/home/paste/htdocs/tempita -doc-dir = docs/html +[egg_info] +tag_build = +tag_svn_revision = 0 +tag_date = 0 [pudge] +organization = Python Paste highlighter = pygments settings = no_about=true link1=http://cheeseshop.python.org/pypi/Tempita Download @@ -23,13 +16,20 @@ docs = docs/index.txt docs/license.txt title = Tempita modules = tempita -theme = pythonpaste.org doc_base = docs/ +theme = pythonpaste.org mailing_list_url = /community/mailing-list.html -organization = Python Paste organization_url = http://pythonpaste.org/ trac_url = http://trac.pythonpaste.org/ +[publish] +doc-dest = scp://i...@webwareforpython.org/home/paste/htdocs/tempita +doc-dir = docs/html + [aliases] distribute = register sdist bdist_egg upload pudge publish +[nosetests] +with-doctest = 1 +doctest-extension = txt + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/setup.py new/Tempita-0.5.2/setup.py --- old/Tempita-0.5.1/setup.py 2011-06-13 17:40:58.000000000 +0200 +++ new/Tempita-0.5.2/setup.py 2013-12-17 05:07:27.000000000 +0100 @@ -1,7 +1,6 @@ -from setuptools import setup, find_packages -import sys, os +from setuptools import setup -version = '0.5.1' +version = '0.5.2' setup(name='Tempita', version=version, @@ -18,10 +17,6 @@ <http://pythonpaste.org/tempita/#the-language>`_, the `interface <http://pythonpaste.org/tempita/#the-interface>`_, and there's nothing more to learn about it. - -You can install from the `svn repository -<http://svn.pythonpaste.org/Tempita/trunk#Tempita-dev>`__ with -``easy_install Tempita==dev``. """, classifiers=[ 'Development Status :: 4 - Beta', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/tempita/__init__.py new/Tempita-0.5.2/tempita/__init__.py --- old/Tempita-0.5.1/tempita/__init__.py 2010-12-22 00:56:35.000000000 +0100 +++ new/Tempita-0.5.2/tempita/__init__.py 2013-12-17 04:59:28.000000000 +0100 @@ -93,21 +93,21 @@ def __init__(self, content, name=None, namespace=None, stacklevel=None, get_template=None, default_inherit=None, line_offset=0, - delimeters=None): + delimiters=None): self.content = content - # set delimeters - if delimeters is None: - delimeters = (self.default_namespace['start_braces'], + # set delimiters + if delimiters is None: + delimiters = (self.default_namespace['start_braces'], self.default_namespace['end_braces']) else: - assert len(delimeters) == 2 and all([isinstance(delimeter, basestring) - for delimeter in delimeters]) + assert len(delimiters) == 2 and all([isinstance(delimeter, basestring) + for delimeter in delimiters]) self.default_namespace = self.__class__.default_namespace.copy() - self.default_namespace['start_braces'] = delimeters[0] - self.default_namespace['end_braces'] = delimeters[1] - self.delimeters = delimeters - + self.default_namespace['start_braces'] = delimiters[0] + self.default_namespace['end_braces'] = delimiters[1] + self.delimiters = delimiters + self._unicode = is_unicode(content) if name is None and stacklevel is not None: try: @@ -128,7 +128,7 @@ if lineno: name += ':%s' % lineno self.name = name - self._parsed = parse(content, name=name, line_offset=line_offset, delimeters=self.delimeters) + self._parsed = parse(content, name=name, line_offset=line_offset, delimiters=self.delimiters) if namespace is None: namespace = {} self.namespace = namespace @@ -371,9 +371,9 @@ return msg -def sub(content, delimeters=None, **kw): +def sub(content, delimiters=None, **kw): name = kw.get('__name') - tmpl = Template(content, name=name, delimeters=delimeters) + tmpl = Template(content, name=name, delimiters=delimiters) return tmpl.substitute(kw) @@ -631,7 +631,7 @@ ############################################################ -def lex(s, name=None, trim_whitespace=True, line_offset=0, delimeters=None): +def lex(s, name=None, trim_whitespace=True, line_offset=0, delimiters=None): """ Lex a string into chunks: @@ -653,27 +653,27 @@ TemplateError: {{ inside expression at line 1 column 10 """ - if delimeters is None: - delimeters = ( Template.default_namespace['start_braces'], + if delimiters is None: + delimiters = ( Template.default_namespace['start_braces'], Template.default_namespace['end_braces'] ) in_expr = False chunks = [] last = 0 last_pos = (1, 1) - token_re = re.compile(r'%s|%s' % (re.escape(delimeters[0]), - re.escape(delimeters[1]))) + token_re = re.compile(r'%s|%s' % (re.escape(delimiters[0]), + re.escape(delimiters[1]))) for match in token_re.finditer(s): expr = match.group(0) pos = find_position(s, match.end(), line_offset) - if expr == delimeters[0] and in_expr: - raise TemplateError('%s inside expression' % delimeters[0], + if expr == delimiters[0] and in_expr: + raise TemplateError('%s inside expression' % delimiters[0], position=pos, name=name) - elif expr == delimeters[1] and not in_expr: - raise TemplateError('%s outside expression' % delimeters[1], + elif expr == delimiters[1] and not in_expr: + raise TemplateError('%s outside expression' % delimiters[1], position=pos, name=name) - if expr == delimeters[0]: + if expr == delimiters[0]: part = s[last:match.start()] if part: chunks.append(part) @@ -684,7 +684,7 @@ last = match.end() last_pos = pos if in_expr: - raise TemplateError('No %s to finish last expression' % delimeters[1], + raise TemplateError('No %s to finish last expression' % delimiters[1], name=name, position=last_pos) part = s[last:] if part: @@ -764,7 +764,7 @@ return (len(leading) + line_offset, len(leading[-1]) + 1) -def parse(s, name=None, line_offset=0, delimeters=None): +def parse(s, name=None, line_offset=0, delimiters=None): r""" Parses a string into a kind of AST @@ -814,10 +814,10 @@ ... TemplateError: Multi-line py blocks must start with a newline at line 1 column 3 """ - if delimeters is None: - delimeters = ( Template.default_namespace['start_braces'], + if delimiters is None: + delimiters = ( Template.default_namespace['start_braces'], Template.default_namespace['end_braces'] ) - tokens = lex(s, name=name, line_offset=line_offset, delimeters=delimeters) + tokens = lex(s, name=name, line_offset=line_offset, delimiters=delimiters) result = [] while tokens: next_chunk, tokens = parse_expr(tokens, name) @@ -1118,14 +1118,18 @@ def fill_command(args=None): import sys import optparse - import pkg_resources import os if args is None: args = sys.argv[1:] - dist = pkg_resources.get_distribution('Paste') - parser = optparse.OptionParser( - version=coerce_text(dist), - usage=_fill_command_usage) + kwargs = dict(usage=_fill_command_usage) + try: + import pkg_resources + dist = pkg_resources.get_distribution('tempita') + kwargs['version'] = coerce_text(dist) + except ImportError: + # pkg_resources not available + pass + parser = optparse.OptionParser(**kwargs) parser.add_option( '-o', '--output', dest='output', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tempita-0.5.1/tempita/__main__.py new/Tempita-0.5.2/tempita/__main__.py --- old/Tempita-0.5.1/tempita/__main__.py 1970-01-01 01:00:00.000000000 +0100 +++ new/Tempita-0.5.2/tempita/__main__.py 2013-12-17 04:45:50.000000000 +0100 @@ -0,0 +1,3 @@ +from tempita import fill_command + +fill_command()
