diff --git a/SOURCES/paste-27-lambda.patch b/SOURCES/paste-27-lambda.patch new file mode 100644 index 00000000..91dcad13 --- /dev/null +++ b/SOURCES/paste-27-lambda.patch @@ -0,0 +1,12 @@ +diff -r 30425672adf7 paste/auth/cookie.py +--- a/paste/auth/cookie.py Wed Jun 23 17:15:45 2010 -0500 ++++ b/paste/auth/cookie.py Mon Aug 02 20:06:43 2010 -0700 +@@ -62,7 +62,7 @@ + _decode = [(v, k) for (k, v) in _encode] + _decode.reverse() + def encode(s, sublist = _encode): +- return reduce((lambda a, (b, c): a.replace(b, c)), sublist, str(s)) ++ return reduce((lambda a, b: a.replace(b[0], b[1])), sublist, str(s)) + decode = lambda s: encode(s, _decode) + + class CookieTooLarge(RuntimeError): diff --git a/SOURCES/paste-digest-snap.patch b/SOURCES/paste-digest-snap.patch new file mode 100644 index 00000000..ca230e4e --- /dev/null +++ b/SOURCES/paste-digest-snap.patch @@ -0,0 +1,50 @@ +diff -r abaf4a78f69b paste/auth/digest.py +--- a/paste/auth/digest.py Wed Dec 21 09:00:48 2011 -0800 ++++ b/paste/auth/digest.py Wed Dec 21 16:03:49 2011 -0800 +@@ -38,6 +38,34 @@ + import time, random + from urllib import quote as url_quote + ++def _split_auth_string(auth_string): ++ """ split a digest auth string into individual key=value strings """ ++ prev = None ++ for item in auth_string.split(","): ++ try: ++ if prev.count('"') == 1: ++ prev = "%s,%s" % (prev, item) ++ continue ++ except AttributeError: ++ if prev == None: ++ prev = item ++ continue ++ else: ++ raise StopIteration ++ yield prev.strip() ++ prev = item ++ ++ yield prev.strip() ++ raise StopIteration ++ ++def _auth_to_kv_pairs(auth_string): ++ """ split a digest auth string into key, value pairs """ ++ for item in _split_auth_string(auth_string): ++ (k, v) = item.split("=", 1) ++ if v.startswith('"') and len(v) > 1 and v.endswith('"'): ++ v = v[1:-1] ++ yield (k, v) ++ + def digest_password(realm, username, password): + """ construct the appropriate hashcode needed for HTTP digest """ + return md5("%s:%s:%s" % (username, realm, password)).hexdigest() +@@ -98,10 +126,7 @@ + (authmeth, auth) = authorization.split(" ", 1) + if 'digest' != authmeth.lower(): + return self.build_authentication() +- amap = {} +- for itm in auth.split(","): +- (k,v) = [s.strip() for s in itm.strip().split("=", 1)] +- amap[k] = v.replace('"', '') ++ amap = dict(_auth_to_kv_pairs(auth)) + try: + username = amap['username'] + authpath = amap['uri'] diff --git a/SOURCES/paste-manifest.patch b/SOURCES/paste-manifest.patch new file mode 100644 index 00000000..4f7ee936 --- /dev/null +++ b/SOURCES/paste-manifest.patch @@ -0,0 +1,15 @@ +diff -r 852439f67241 -r abaf4a78f69b MANIFEST.in +--- a/MANIFEST.in Wed Aug 17 15:52:53 2011 -0500 ++++ b/MANIFEST.in Wed Dec 21 09:00:48 2011 -0800 +@@ -1,6 +1,8 @@ +-recursive-include docs *.txt ++recursive-include docs *.txt *.css *.js ++include docs/_templates/*.html + include docs/conf.py ++include docs/test_server.ini + recursive-exclude docs/_build/_sources * + recursive-include docs/_build *.html +-recursive-include tests *.txt *.py +-recursive-include paste *.js *.jpg ++recursive-include tests *.txt *.py *.cgi *.html ++recursive-include paste *.js *.jpg *.png diff --git a/SOURCES/paste-unbundle-stdlib.patch b/SOURCES/paste-unbundle-stdlib.patch new file mode 100644 index 00000000..0df68458 --- /dev/null +++ b/SOURCES/paste-unbundle-stdlib.patch @@ -0,0 +1,64 @@ +Index: Paste-1.7.5/paste/debug/fsdiff.py +=================================================================== +--- Paste-1.7.5.orig/paste/debug/fsdiff.py ++++ Paste-1.7.5/paste/debug/fsdiff.py +@@ -12,7 +12,10 @@ the file was. + import os + from fnmatch import fnmatch + from datetime import datetime +-from paste.util.UserDict24 import IterableUserDict ++try: ++ from UserDict import IterableUserDict ++except ImportError: ++ from paste.util.UserDict24 import IterableUserDict + import operator + import re + +Index: Paste-1.7.5/paste/debug/doctest_webapp.py +=================================================================== +--- Paste-1.7.5.orig/paste/debug/doctest_webapp.py ++++ Paste-1.7.5/paste/debug/doctest_webapp.py +@@ -8,10 +8,7 @@ + These are functions for use when doctest-testing a document. + """ + +-try: +- import subprocess +-except ImportError: +- from paste.util import subprocess24 as subprocess ++import subprocess + import doctest + import os + import sys +Index: Paste-1.7.5/paste/debug/wdg_validate.py +=================================================================== +--- Paste-1.7.5.orig/paste/debug/wdg_validate.py ++++ Paste-1.7.5/paste/debug/wdg_validate.py +@@ -6,10 +6,7 @@ Middleware that tests the validity of al + """ + + from cStringIO import StringIO +-try: +- import subprocess +-except ImportError: +- from paste.util import subprocess24 as subprocess ++import subprocess + from paste.response import header_value + import re + import cgi +Index: Paste-1.7.5/paste/fixture.py +=================================================================== +--- Paste-1.7.5.orig/paste/fixture.py ++++ Paste-1.7.5/paste/fixture.py +@@ -26,10 +26,7 @@ try: + except ImportError: + from StringIO import StringIO + import re +-try: +- import subprocess +-except ImportError: +- from paste.util import subprocess24 as subprocess ++import subprocess + + from paste import wsgilib + from paste import lint diff --git a/SOURCES/paste-unbundle-tempita.patch b/SOURCES/paste-unbundle-tempita.patch new file mode 100644 index 00000000..689973fd --- /dev/null +++ b/SOURCES/paste-unbundle-tempita.patch @@ -0,0 +1,1860 @@ +Index: Paste-1.7.4/paste/util/looper/__init__.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/looper/__init__.py +@@ -0,0 +1,4 @@ ++try: ++ from tempita._looper import * ++except ImportError: ++ from _looper import * +Index: Paste-1.7.4/paste/util/looper/_looper.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/looper/_looper.py +@@ -0,0 +1,152 @@ ++""" ++Helper for looping over sequences, particular in templates. ++ ++Often in a loop in a template it's handy to know what's next up, ++previously up, if this is the first or last item in the sequence, etc. ++These can be awkward to manage in a normal Python loop, but using the ++looper you can get a better sense of the context. Use like:: ++ ++ >>> for loop, item in looper(['a', 'b', 'c']): ++ ... print loop.number, item ++ ... if not loop.last: ++ ... print '---' ++ 1 a ++ --- ++ 2 b ++ --- ++ 3 c ++ ++""" ++ ++__all__ = ['looper'] ++ ++class looper(object): ++ """ ++ Helper for looping (particularly in templates) ++ ++ Use this like:: ++ ++ for loop, item in looper(seq): ++ if loop.first: ++ ... ++ """ ++ ++ def __init__(self, seq): ++ self.seq = seq ++ ++ def __iter__(self): ++ return looper_iter(self.seq) ++ ++ def __repr__(self): ++ return '<%s for %r>' % ( ++ self.__class__.__name__, self.seq) ++ ++class looper_iter(object): ++ ++ def __init__(self, seq): ++ self.seq = list(seq) ++ self.pos = 0 ++ ++ def __iter__(self): ++ return self ++ ++ def next(self): ++ if self.pos >= len(self.seq): ++ raise StopIteration ++ result = loop_pos(self.seq, self.pos), self.seq[self.pos] ++ self.pos += 1 ++ return result ++ ++class loop_pos(object): ++ ++ def __init__(self, seq, pos): ++ self.seq = seq ++ self.pos = pos ++ ++ def __repr__(self): ++ return '' % ( ++ self.seq[pos], pos) ++ ++ def index(self): ++ return self.pos ++ index = property(index) ++ ++ def number(self): ++ return self.pos + 1 ++ number = property(number) ++ ++ def item(self): ++ return self.seq[self.pos] ++ item = property(item) ++ ++ def next(self): ++ try: ++ return self.seq[self.pos+1] ++ except IndexError: ++ return None ++ next = property(next) ++ ++ def previous(self): ++ if self.pos == 0: ++ return None ++ return self.seq[self.pos-1] ++ previous = property(previous) ++ ++ def odd(self): ++ return not self.pos % 2 ++ odd = property(odd) ++ ++ def even(self): ++ return self.pos % 2 ++ even = property(even) ++ ++ def first(self): ++ return self.pos == 0 ++ first = property(first) ++ ++ def last(self): ++ return self.pos == len(self.seq)-1 ++ last = property(last) ++ ++ def length(self): ++ return len(self.seq) ++ length = property(length) ++ ++ def first_group(self, getter=None): ++ """ ++ Returns true if this item is the start of a new group, ++ where groups mean that some attribute has changed. The getter ++ can be None (the item itself changes), an attribute name like ++ ``'.attr'``, a function, or a dict key or list index. ++ """ ++ if self.first: ++ return True ++ return self._compare_group(self.item, self.previous, getter) ++ ++ def last_group(self, getter=None): ++ """ ++ Returns true if this item is the end of a new group, ++ where groups mean that some attribute has changed. The getter ++ can be None (the item itself changes), an attribute name like ++ ``'.attr'``, a function, or a dict key or list index. ++ """ ++ if self.last: ++ return True ++ return self._compare_group(self.item, self.next, getter) ++ ++ def _compare_group(self, item, other, getter): ++ if getter is None: ++ return item != other ++ elif (isinstance(getter, basestring) ++ and getter.startswith('.')): ++ getter = getter[1:] ++ if getter.endswith('()'): ++ getter = getter[:-2] ++ return getattr(item, getter)() != getattr(other, getter)() ++ else: ++ return getattr(item, getter) != getattr(other, getter) ++ elif callable(getter): ++ return getter(item) != getter(other) ++ else: ++ return item[getter] != other[getter] ++ +Index: Paste-1.7.4/paste/util/looper.py +=================================================================== +--- Paste-1.7.4.orig/paste/util/looper.py ++++ /dev/null +@@ -1,152 +0,0 @@ +-""" +-Helper for looping over sequences, particular in templates. +- +-Often in a loop in a template it's handy to know what's next up, +-previously up, if this is the first or last item in the sequence, etc. +-These can be awkward to manage in a normal Python loop, but using the +-looper you can get a better sense of the context. Use like:: +- +- >>> for loop, item in looper(['a', 'b', 'c']): +- ... print loop.number, item +- ... if not loop.last: +- ... print '---' +- 1 a +- --- +- 2 b +- --- +- 3 c +- +-""" +- +-__all__ = ['looper'] +- +-class looper(object): +- """ +- Helper for looping (particularly in templates) +- +- Use this like:: +- +- for loop, item in looper(seq): +- if loop.first: +- ... +- """ +- +- def __init__(self, seq): +- self.seq = seq +- +- def __iter__(self): +- return looper_iter(self.seq) +- +- def __repr__(self): +- return '<%s for %r>' % ( +- self.__class__.__name__, self.seq) +- +-class looper_iter(object): +- +- def __init__(self, seq): +- self.seq = list(seq) +- self.pos = 0 +- +- def __iter__(self): +- return self +- +- def next(self): +- if self.pos >= len(self.seq): +- raise StopIteration +- result = loop_pos(self.seq, self.pos), self.seq[self.pos] +- self.pos += 1 +- return result +- +-class loop_pos(object): +- +- def __init__(self, seq, pos): +- self.seq = seq +- self.pos = pos +- +- def __repr__(self): +- return '' % ( +- self.seq[pos], pos) +- +- def index(self): +- return self.pos +- index = property(index) +- +- def number(self): +- return self.pos + 1 +- number = property(number) +- +- def item(self): +- return self.seq[self.pos] +- item = property(item) +- +- def next(self): +- try: +- return self.seq[self.pos+1] +- except IndexError: +- return None +- next = property(next) +- +- def previous(self): +- if self.pos == 0: +- return None +- return self.seq[self.pos-1] +- previous = property(previous) +- +- def odd(self): +- return not self.pos % 2 +- odd = property(odd) +- +- def even(self): +- return self.pos % 2 +- even = property(even) +- +- def first(self): +- return self.pos == 0 +- first = property(first) +- +- def last(self): +- return self.pos == len(self.seq)-1 +- last = property(last) +- +- def length(self): +- return len(self.seq) +- length = property(length) +- +- def first_group(self, getter=None): +- """ +- Returns true if this item is the start of a new group, +- where groups mean that some attribute has changed. The getter +- can be None (the item itself changes), an attribute name like +- ``'.attr'``, a function, or a dict key or list index. +- """ +- if self.first: +- return True +- return self._compare_group(self.item, self.previous, getter) +- +- def last_group(self, getter=None): +- """ +- Returns true if this item is the end of a new group, +- where groups mean that some attribute has changed. The getter +- can be None (the item itself changes), an attribute name like +- ``'.attr'``, a function, or a dict key or list index. +- """ +- if self.last: +- return True +- return self._compare_group(self.item, self.next, getter) +- +- def _compare_group(self, item, other, getter): +- if getter is None: +- return item != other +- elif (isinstance(getter, basestring) +- and getter.startswith('.')): +- getter = getter[1:] +- if getter.endswith('()'): +- getter = getter[:-2] +- return getattr(item, getter)() != getattr(other, getter)() +- else: +- return getattr(item, getter) != getattr(other, getter) +- elif callable(getter): +- return getter(item) != getter(other) +- else: +- return item[getter] != other[getter] +- +Index: Paste-1.7.4/paste/util/template/__init__.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/template/__init__.py +@@ -0,0 +1,6 @@ ++try: ++ from tempita import * ++ from tempita import paste_script_template_renderer ++except ImportError: ++ from _template import * ++ from _template import paste_script_template_renderer +Index: Paste-1.7.4/paste/util/template/_template.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/template/_template.py +@@ -0,0 +1,758 @@ ++""" ++A small templating language ++ ++This implements a small templating language for use internally in ++Paste and Paste Script. This language implements if/elif/else, ++for/continue/break, expressions, and blocks of Python code. The ++syntax is:: ++ ++ {{any expression (function calls etc)}} ++ {{any expression | filter}} ++ {{for x in y}}...{{endfor}} ++ {{if x}}x{{elif y}}y{{else}}z{{endif}} ++ {{py:x=1}} ++ {{py: ++ def foo(bar): ++ return 'baz' ++ }} ++ {{default var = default_value}} ++ {{# comment}} ++ ++You use this with the ``Template`` class or the ``sub`` shortcut. ++The ``Template`` class takes the template string and the name of ++the template (for errors) and a default namespace. Then (like ++``string.Template``) you can call the ``tmpl.substitute(**kw)`` ++method to make a substitution (or ``tmpl.substitute(a_dict)``). ++ ++``sub(content, **kw)`` substitutes the template immediately. You ++can use ``__name='tmpl.html'`` to set the name of the template. ++ ++If there are syntax errors ``TemplateError`` will be raised. ++""" ++ ++import re ++import sys ++import cgi ++import urllib ++from paste.util.looper import looper ++ ++__all__ = ['TemplateError', 'Template', 'sub', 'HTMLTemplate', ++ 'sub_html', 'html', 'bunch'] ++ ++token_re = re.compile(r'\{\{|\}\}') ++in_re = re.compile(r'\s+in\s+') ++var_re = re.compile(r'^[a-z_][a-z0-9_]*$', re.I) ++ ++class TemplateError(Exception): ++ """Exception raised while parsing a template ++ """ ++ ++ def __init__(self, message, position, name=None): ++ self.message = message ++ self.position = position ++ self.name = name ++ ++ def __str__(self): ++ msg = '%s at line %s column %s' % ( ++ self.message, self.position[0], self.position[1]) ++ if self.name: ++ msg += ' in %s' % self.name ++ return msg ++ ++class _TemplateContinue(Exception): ++ pass ++ ++class _TemplateBreak(Exception): ++ pass ++ ++class Template(object): ++ ++ default_namespace = { ++ 'start_braces': '{{', ++ 'end_braces': '}}', ++ 'looper': looper, ++ } ++ ++ default_encoding = 'utf8' ++ ++ def __init__(self, content, name=None, namespace=None): ++ self.content = content ++ self._unicode = isinstance(content, unicode) ++ self.name = name ++ self._parsed = parse(content, name=name) ++ if namespace is None: ++ namespace = {} ++ self.namespace = namespace ++ ++ def from_filename(cls, filename, namespace=None, encoding=None): ++ f = open(filename, 'rb') ++ c = f.read() ++ f.close() ++ if encoding: ++ c = c.decode(encoding) ++ return cls(content=c, name=filename, namespace=namespace) ++ ++ from_filename = classmethod(from_filename) ++ ++ def __repr__(self): ++ return '<%s %s name=%r>' % ( ++ self.__class__.__name__, ++ hex(id(self))[2:], self.name) ++ ++ def substitute(self, *args, **kw): ++ if args: ++ if kw: ++ raise TypeError( ++ "You can only give positional *or* keyword arguments") ++ if len(args) > 1: ++ raise TypeError( ++ "You can only give on positional argument") ++ kw = args[0] ++ ns = self.default_namespace.copy() ++ ns.update(self.namespace) ++ ns.update(kw) ++ result = self._interpret(ns) ++ return result ++ ++ def _interpret(self, ns): ++ __traceback_hide__ = True ++ parts = [] ++ self._interpret_codes(self._parsed, ns, out=parts) ++ return ''.join(parts) ++ ++ def _interpret_codes(self, codes, ns, out): ++ __traceback_hide__ = True ++ for item in codes: ++ if isinstance(item, basestring): ++ out.append(item) ++ else: ++ self._interpret_code(item, ns, out) ++ ++ def _interpret_code(self, code, ns, out): ++ __traceback_hide__ = True ++ name, pos = code[0], code[1] ++ if name == 'py': ++ self._exec(code[2], ns, pos) ++ elif name == 'continue': ++ raise _TemplateContinue() ++ elif name == 'break': ++ raise _TemplateBreak() ++ elif name == 'for': ++ vars, expr, content = code[2], code[3], code[4] ++ expr = self._eval(expr, ns, pos) ++ self._interpret_for(vars, expr, content, ns, out) ++ elif name == 'cond': ++ parts = code[2:] ++ self._interpret_if(parts, ns, out) ++ elif name == 'expr': ++ parts = code[2].split('|') ++ base = self._eval(parts[0], ns, pos) ++ for part in parts[1:]: ++ func = self._eval(part, ns, pos) ++ base = func(base) ++ out.append(self._repr(base, pos)) ++ elif name == 'default': ++ var, expr = code[2], code[3] ++ if var not in ns: ++ result = self._eval(expr, ns, pos) ++ ns[var] = result ++ elif name == 'comment': ++ return ++ else: ++ assert 0, "Unknown code: %r" % name ++ ++ def _interpret_for(self, vars, expr, content, ns, out): ++ __traceback_hide__ = True ++ for item in expr: ++ if len(vars) == 1: ++ ns[vars[0]] = item ++ else: ++ if len(vars) != len(item): ++ raise ValueError( ++ 'Need %i items to unpack (got %i items)' ++ % (len(vars), len(item))) ++ for name, value in zip(vars, item): ++ ns[name] = value ++ try: ++ self._interpret_codes(content, ns, out) ++ except _TemplateContinue: ++ continue ++ except _TemplateBreak: ++ break ++ ++ def _interpret_if(self, parts, ns, out): ++ __traceback_hide__ = True ++ # @@: if/else/else gets through ++ for part in parts: ++ assert not isinstance(part, basestring) ++ name, pos = part[0], part[1] ++ if name == 'else': ++ result = True ++ else: ++ result = self._eval(part[2], ns, pos) ++ if result: ++ self._interpret_codes(part[3], ns, out) ++ break ++ ++ def _eval(self, code, ns, pos): ++ __traceback_hide__ = True ++ try: ++ value = eval(code, ns) ++ return value ++ except: ++ exc_info = sys.exc_info() ++ e = exc_info[1] ++ if getattr(e, 'args'): ++ arg0 = e.args[0] ++ else: ++ arg0 = str(e) ++ e.args = (self._add_line_info(arg0, pos),) ++ raise exc_info[0], e, exc_info[2] ++ ++ def _exec(self, code, ns, pos): ++ __traceback_hide__ = True ++ try: ++ exec code in ns ++ except: ++ exc_info = sys.exc_info() ++ e = exc_info[1] ++ e.args = (self._add_line_info(e.args[0], pos),) ++ raise exc_info[0], e, exc_info[2] ++ ++ def _repr(self, value, pos): ++ __traceback_hide__ = True ++ try: ++ if value is None: ++ return '' ++ if self._unicode: ++ try: ++ value = unicode(value) ++ except UnicodeDecodeError: ++ value = str(value) ++ else: ++ value = str(value) ++ except: ++ exc_info = sys.exc_info() ++ e = exc_info[1] ++ e.args = (self._add_line_info(e.args[0], pos),) ++ raise exc_info[0], e, exc_info[2] ++ else: ++ if self._unicode and isinstance(value, str): ++ if not self.decode_encoding: ++ raise UnicodeDecodeError( ++ 'Cannot decode str value %r into unicode ' ++ '(no default_encoding provided)' % value) ++ value = value.decode(self.default_encoding) ++ elif not self._unicode and isinstance(value, unicode): ++ if not self.decode_encoding: ++ raise UnicodeEncodeError( ++ 'Cannot encode unicode value %r into str ' ++ '(no default_encoding provided)' % value) ++ value = value.encode(self.default_encoding) ++ return value ++ ++ ++ def _add_line_info(self, msg, pos): ++ msg = "%s at line %s column %s" % ( ++ msg, pos[0], pos[1]) ++ if self.name: ++ msg += " in file %s" % self.name ++ return msg ++ ++def sub(content, **kw): ++ name = kw.get('__name') ++ tmpl = Template(content, name=name) ++ return tmpl.substitute(kw) ++ return result ++ ++def paste_script_template_renderer(content, vars, filename=None): ++ tmpl = Template(content, name=filename) ++ return tmpl.substitute(vars) ++ ++class bunch(dict): ++ ++ def __init__(self, **kw): ++ for name, value in kw.items(): ++ setattr(self, name, value) ++ ++ def __setattr__(self, name, value): ++ self[name] = value ++ ++ def __getattr__(self, name): ++ try: ++ return self[name] ++ except KeyError: ++ raise AttributeError(name) ++ ++ def __getitem__(self, key): ++ if 'default' in self: ++ try: ++ return dict.__getitem__(self, key) ++ except KeyError: ++ return dict.__getitem__(self, 'default') ++ else: ++ return dict.__getitem__(self, key) ++ ++ def __repr__(self): ++ items = [ ++ (k, v) for k, v in self.items()] ++ items.sort() ++ return '<%s %s>' % ( ++ self.__class__.__name__, ++ ' '.join(['%s=%r' % (k, v) for k, v in items])) ++ ++############################################################ ++## HTML Templating ++############################################################ ++ ++class html(object): ++ def __init__(self, value): ++ self.value = value ++ def __str__(self): ++ return self.value ++ def __repr__(self): ++ return '<%s %r>' % ( ++ self.__class__.__name__, self.value) ++ ++def html_quote(value): ++ if value is None: ++ return '' ++ if not isinstance(value, basestring): ++ if hasattr(value, '__unicode__'): ++ value = unicode(value) ++ else: ++ value = str(value) ++ value = cgi.escape(value, 1) ++ if isinstance(value, unicode): ++ value = value.encode('ascii', 'xmlcharrefreplace') ++ return value ++ ++def url(v): ++ if not isinstance(v, basestring): ++ if hasattr(v, '__unicode__'): ++ v = unicode(v) ++ else: ++ v = str(v) ++ if isinstance(v, unicode): ++ v = v.encode('utf8') ++ return urllib.quote(v) ++ ++def attr(**kw): ++ kw = kw.items() ++ kw.sort() ++ parts = [] ++ for name, value in kw: ++ if value is None: ++ continue ++ if name.endswith('_'): ++ name = name[:-1] ++ parts.append('%s="%s"' % (html_quote(name), html_quote(value))) ++ return html(' '.join(parts)) ++ ++class HTMLTemplate(Template): ++ ++ default_namespace = Template.default_namespace.copy() ++ default_namespace.update(dict( ++ html=html, ++ attr=attr, ++ url=url, ++ )) ++ ++ def _repr(self, value, pos): ++ plain = Template._repr(self, value, pos) ++ if isinstance(value, html): ++ return plain ++ else: ++ return html_quote(plain) ++ ++def sub_html(content, **kw): ++ name = kw.get('__name') ++ tmpl = HTMLTemplate(content, name=name) ++ return tmpl.substitute(kw) ++ return result ++ ++ ++############################################################ ++## Lexing and Parsing ++############################################################ ++ ++def lex(s, name=None, trim_whitespace=True): ++ """ ++ Lex a string into chunks: ++ ++ >>> lex('hey') ++ ['hey'] ++ >>> lex('hey {{you}}') ++ ['hey ', ('you', (1, 7))] ++ >>> lex('hey {{') ++ Traceback (most recent call last): ++ ... ++ TemplateError: No }} to finish last expression at line 1 column 7 ++ >>> lex('hey }}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: }} outside expression at line 1 column 7 ++ >>> lex('hey {{ {{') ++ Traceback (most recent call last): ++ ... ++ TemplateError: {{ inside expression at line 1 column 10 ++ ++ """ ++ in_expr = False ++ chunks = [] ++ last = 0 ++ last_pos = (1, 1) ++ for match in token_re.finditer(s): ++ expr = match.group(0) ++ pos = find_position(s, match.end()) ++ if expr == '{{' and in_expr: ++ raise TemplateError('{{ inside expression', position=pos, ++ name=name) ++ elif expr == '}}' and not in_expr: ++ raise TemplateError('}} outside expression', position=pos, ++ name=name) ++ if expr == '{{': ++ part = s[last:match.start()] ++ if part: ++ chunks.append(part) ++ in_expr = True ++ else: ++ chunks.append((s[last:match.start()], last_pos)) ++ in_expr = False ++ last = match.end() ++ last_pos = pos ++ if in_expr: ++ raise TemplateError('No }} to finish last expression', ++ name=name, position=last_pos) ++ part = s[last:] ++ if part: ++ chunks.append(part) ++ if trim_whitespace: ++ chunks = trim_lex(chunks) ++ return chunks ++ ++statement_re = re.compile(r'^(?:if |elif |else |for |py:)') ++single_statements = ['endif', 'endfor', 'continue', 'break'] ++trail_whitespace_re = re.compile(r'\n[\t ]*$') ++lead_whitespace_re = re.compile(r'^[\t ]*\n') ++ ++def trim_lex(tokens): ++ r""" ++ Takes a lexed set of tokens, and removes whitespace when there is ++ a directive on a line by itself: ++ ++ >>> tokens = lex('{{if x}}\nx\n{{endif}}\ny', trim_whitespace=False) ++ >>> tokens ++ [('if x', (1, 3)), '\nx\n', ('endif', (3, 3)), '\ny'] ++ >>> trim_lex(tokens) ++ [('if x', (1, 3)), 'x\n', ('endif', (3, 3)), 'y'] ++ """ ++ for i in range(len(tokens)): ++ current = tokens[i] ++ if isinstance(tokens[i], basestring): ++ # we don't trim this ++ continue ++ item = current[0] ++ if not statement_re.search(item) and item not in single_statements: ++ continue ++ if not i: ++ prev = '' ++ else: ++ prev = tokens[i-1] ++ if i+1 >= len(tokens): ++ next = '' ++ else: ++ next = tokens[i+1] ++ if (not isinstance(next, basestring) ++ or not isinstance(prev, basestring)): ++ continue ++ if ((not prev or trail_whitespace_re.search(prev)) ++ and (not next or lead_whitespace_re.search(next))): ++ if prev: ++ m = trail_whitespace_re.search(prev) ++ # +1 to leave the leading \n on: ++ prev = prev[:m.start()+1] ++ tokens[i-1] = prev ++ if next: ++ m = lead_whitespace_re.search(next) ++ next = next[m.end():] ++ tokens[i+1] = next ++ return tokens ++ ++ ++def find_position(string, index): ++ """Given a string and index, return (line, column)""" ++ leading = string[:index].splitlines() ++ return (len(leading), len(leading[-1])+1) ++ ++def parse(s, name=None): ++ r""" ++ Parses a string into a kind of AST ++ ++ >>> parse('{{x}}') ++ [('expr', (1, 3), 'x')] ++ >>> parse('foo') ++ ['foo'] ++ >>> parse('{{if x}}test{{endif}}') ++ [('cond', (1, 3), ('if', (1, 3), 'x', ['test']))] ++ >>> parse('series->{{for x in y}}x={{x}}{{endfor}}') ++ ['series->', ('for', (1, 11), ('x',), 'y', ['x=', ('expr', (1, 27), 'x')])] ++ >>> parse('{{for x, y in z:}}{{continue}}{{endfor}}') ++ [('for', (1, 3), ('x', 'y'), 'z', [('continue', (1, 21))])] ++ >>> parse('{{py:x=1}}') ++ [('py', (1, 3), 'x=1')] ++ >>> parse('{{if x}}a{{elif y}}b{{else}}c{{endif}}') ++ [('cond', (1, 3), ('if', (1, 3), 'x', ['a']), ('elif', (1, 12), 'y', ['b']), ('else', (1, 23), None, ['c']))] ++ ++ Some exceptions:: ++ ++ >>> parse('{{continue}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: continue outside of for loop at line 1 column 3 ++ >>> parse('{{if x}}foo') ++ Traceback (most recent call last): ++ ... ++ TemplateError: No {{endif}} at line 1 column 3 ++ >>> parse('{{else}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: else outside of an if block at line 1 column 3 ++ >>> parse('{{if x}}{{for x in y}}{{endif}}{{endfor}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: Unexpected endif at line 1 column 25 ++ >>> parse('{{if}}{{endif}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: if with no expression at line 1 column 3 ++ >>> parse('{{for x y}}{{endfor}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: Bad for (no "in") in 'x y' at line 1 column 3 ++ >>> parse('{{py:x=1\ny=2}}') ++ Traceback (most recent call last): ++ ... ++ TemplateError: Multi-line py blocks must start with a newline at line 1 column 3 ++ """ ++ tokens = lex(s, name=name) ++ result = [] ++ while tokens: ++ next, tokens = parse_expr(tokens, name) ++ result.append(next) ++ return result ++ ++def parse_expr(tokens, name, context=()): ++ if isinstance(tokens[0], basestring): ++ return tokens[0], tokens[1:] ++ expr, pos = tokens[0] ++ expr = expr.strip() ++ if expr.startswith('py:'): ++ expr = expr[3:].lstrip(' \t') ++ if expr.startswith('\n'): ++ expr = expr[1:] ++ else: ++ if '\n' in expr: ++ raise TemplateError( ++ 'Multi-line py blocks must start with a newline', ++ position=pos, name=name) ++ return ('py', pos, expr), tokens[1:] ++ elif expr in ('continue', 'break'): ++ if 'for' not in context: ++ raise TemplateError( ++ 'continue outside of for loop', ++ position=pos, name=name) ++ return (expr, pos), tokens[1:] ++ elif expr.startswith('if '): ++ return parse_cond(tokens, name, context) ++ elif (expr.startswith('elif ') ++ or expr == 'else'): ++ raise TemplateError( ++ '%s outside of an if block' % expr.split()[0], ++ position=pos, name=name) ++ elif expr in ('if', 'elif', 'for'): ++ raise TemplateError( ++ '%s with no expression' % expr, ++ position=pos, name=name) ++ elif expr in ('endif', 'endfor'): ++ raise TemplateError( ++ 'Unexpected %s' % expr, ++ position=pos, name=name) ++ elif expr.startswith('for '): ++ return parse_for(tokens, name, context) ++ elif expr.startswith('default '): ++ return parse_default(tokens, name, context) ++ elif expr.startswith('#'): ++ return ('comment', pos, tokens[0][0]), tokens[1:] ++ return ('expr', pos, tokens[0][0]), tokens[1:] ++ ++def parse_cond(tokens, name, context): ++ start = tokens[0][1] ++ pieces = [] ++ context = context + ('if',) ++ while 1: ++ if not tokens: ++ raise TemplateError( ++ 'Missing {{endif}}', ++ position=start, name=name) ++ if (isinstance(tokens[0], tuple) ++ and tokens[0][0] == 'endif'): ++ return ('cond', start) + tuple(pieces), tokens[1:] ++ next, tokens = parse_one_cond(tokens, name, context) ++ pieces.append(next) ++ ++def parse_one_cond(tokens, name, context): ++ (first, pos), tokens = tokens[0], tokens[1:] ++ content = [] ++ if first.endswith(':'): ++ first = first[:-1] ++ if first.startswith('if '): ++ part = ('if', pos, first[3:].lstrip(), content) ++ elif first.startswith('elif '): ++ part = ('elif', pos, first[5:].lstrip(), content) ++ elif first == 'else': ++ part = ('else', pos, None, content) ++ else: ++ assert 0, "Unexpected token %r at %s" % (first, pos) ++ while 1: ++ if not tokens: ++ raise TemplateError( ++ 'No {{endif}}', ++ position=pos, name=name) ++ if (isinstance(tokens[0], tuple) ++ and (tokens[0][0] == 'endif' ++ or tokens[0][0].startswith('elif ') ++ or tokens[0][0] == 'else')): ++ return part, tokens ++ next, tokens = parse_expr(tokens, name, context) ++ content.append(next) ++ ++def parse_for(tokens, name, context): ++ first, pos = tokens[0] ++ tokens = tokens[1:] ++ context = ('for',) + context ++ content = [] ++ assert first.startswith('for ') ++ if first.endswith(':'): ++ first = first[:-1] ++ first = first[3:].strip() ++ match = in_re.search(first) ++ if not match: ++ raise TemplateError( ++ 'Bad for (no "in") in %r' % first, ++ position=pos, name=name) ++ vars = first[:match.start()] ++ if '(' in vars: ++ raise TemplateError( ++ 'You cannot have () in the variable section of a for loop (%r)' ++ % vars, position=pos, name=name) ++ vars = tuple([ ++ v.strip() for v in first[:match.start()].split(',') ++ if v.strip()]) ++ expr = first[match.end():] ++ while 1: ++ if not tokens: ++ raise TemplateError( ++ 'No {{endfor}}', ++ position=pos, name=name) ++ if (isinstance(tokens[0], tuple) ++ and tokens[0][0] == 'endfor'): ++ return ('for', pos, vars, expr, content), tokens[1:] ++ next, tokens = parse_expr(tokens, name, context) ++ content.append(next) ++ ++def parse_default(tokens, name, context): ++ first, pos = tokens[0] ++ assert first.startswith('default ') ++ first = first.split(None, 1)[1] ++ parts = first.split('=', 1) ++ if len(parts) == 1: ++ raise TemplateError( ++ "Expression must be {{default var=value}}; no = found in %r" % first, ++ position=pos, name=name) ++ var = parts[0].strip() ++ if ',' in var: ++ raise TemplateError( ++ "{{default x, y = ...}} is not supported", ++ position=pos, name=name) ++ if not var_re.search(var): ++ raise TemplateError( ++ "Not a valid variable name for {{default}}: %r" ++ % var, position=pos, name=name) ++ expr = parts[1].strip() ++ return ('default', pos, var, expr), tokens[1:] ++ ++_fill_command_usage = """\ ++%prog [OPTIONS] TEMPLATE arg=value ++ ++Use py:arg=value to set a Python value; otherwise all values are ++strings. ++""" ++ ++def fill_command(args=None): ++ import sys, optparse, pkg_resources, os ++ if args is None: ++ args = sys.argv[1:] ++ dist = pkg_resources.get_distribution('Paste') ++ parser = optparse.OptionParser( ++ version=str(dist), ++ usage=_fill_command_usage) ++ parser.add_option( ++ '-o', '--output', ++ dest='output', ++ metavar="FILENAME", ++ help="File to write output to (default stdout)") ++ parser.add_option( ++ '--html', ++ dest='use_html', ++ action='store_true', ++ help="Use HTML style filling (including automatic HTML quoting)") ++ parser.add_option( ++ '--env', ++ dest='use_env', ++ action='store_true', ++ help="Put the environment in as top-level variables") ++ options, args = parser.parse_args(args) ++ if len(args) < 1: ++ print 'You must give a template filename' ++ print dir(parser) ++ assert 0 ++ template_name = args[0] ++ args = args[1:] ++ vars = {} ++ if options.use_env: ++ vars.update(os.environ) ++ for value in args: ++ if '=' not in value: ++ print 'Bad argument: %r' % value ++ sys.exit(2) ++ name, value = value.split('=', 1) ++ if name.startswith('py:'): ++ name = name[:3] ++ value = eval(value) ++ vars[name] = value ++ if template_name == '-': ++ template_content = sys.stdin.read() ++ template_name = '' ++ else: ++ f = open(template_name, 'rb') ++ template_content = f.read() ++ f.close() ++ if options.use_html: ++ TemplateClass = HTMLTemplate ++ else: ++ TemplateClass = Template ++ template = TemplateClass(template_content, name=template_name) ++ result = template.substitute(vars) ++ if options.output: ++ f = open(options.output, 'wb') ++ f.write(result) ++ f.close() ++ else: ++ sys.stdout.write(result) ++ ++if __name__ == '__main__': ++ from paste.util.template import fill_command ++ fill_command() ++ ++ +Index: Paste-1.7.4/paste/util/template.py +=================================================================== +--- Paste-1.7.4.orig/paste/util/template.py ++++ /dev/null +@@ -1,758 +0,0 @@ +-""" +-A small templating language +- +-This implements a small templating language for use internally in +-Paste and Paste Script. This language implements if/elif/else, +-for/continue/break, expressions, and blocks of Python code. The +-syntax is:: +- +- {{any expression (function calls etc)}} +- {{any expression | filter}} +- {{for x in y}}...{{endfor}} +- {{if x}}x{{elif y}}y{{else}}z{{endif}} +- {{py:x=1}} +- {{py: +- def foo(bar): +- return 'baz' +- }} +- {{default var = default_value}} +- {{# comment}} +- +-You use this with the ``Template`` class or the ``sub`` shortcut. +-The ``Template`` class takes the template string and the name of +-the template (for errors) and a default namespace. Then (like +-``string.Template``) you can call the ``tmpl.substitute(**kw)`` +-method to make a substitution (or ``tmpl.substitute(a_dict)``). +- +-``sub(content, **kw)`` substitutes the template immediately. You +-can use ``__name='tmpl.html'`` to set the name of the template. +- +-If there are syntax errors ``TemplateError`` will be raised. +-""" +- +-import re +-import sys +-import cgi +-import urllib +-from paste.util.looper import looper +- +-__all__ = ['TemplateError', 'Template', 'sub', 'HTMLTemplate', +- 'sub_html', 'html', 'bunch'] +- +-token_re = re.compile(r'\{\{|\}\}') +-in_re = re.compile(r'\s+in\s+') +-var_re = re.compile(r'^[a-z_][a-z0-9_]*$', re.I) +- +-class TemplateError(Exception): +- """Exception raised while parsing a template +- """ +- +- def __init__(self, message, position, name=None): +- self.message = message +- self.position = position +- self.name = name +- +- def __str__(self): +- msg = '%s at line %s column %s' % ( +- self.message, self.position[0], self.position[1]) +- if self.name: +- msg += ' in %s' % self.name +- return msg +- +-class _TemplateContinue(Exception): +- pass +- +-class _TemplateBreak(Exception): +- pass +- +-class Template(object): +- +- default_namespace = { +- 'start_braces': '{{', +- 'end_braces': '}}', +- 'looper': looper, +- } +- +- default_encoding = 'utf8' +- +- def __init__(self, content, name=None, namespace=None): +- self.content = content +- self._unicode = isinstance(content, unicode) +- self.name = name +- self._parsed = parse(content, name=name) +- if namespace is None: +- namespace = {} +- self.namespace = namespace +- +- def from_filename(cls, filename, namespace=None, encoding=None): +- f = open(filename, 'rb') +- c = f.read() +- f.close() +- if encoding: +- c = c.decode(encoding) +- return cls(content=c, name=filename, namespace=namespace) +- +- from_filename = classmethod(from_filename) +- +- def __repr__(self): +- return '<%s %s name=%r>' % ( +- self.__class__.__name__, +- hex(id(self))[2:], self.name) +- +- def substitute(self, *args, **kw): +- if args: +- if kw: +- raise TypeError( +- "You can only give positional *or* keyword arguments") +- if len(args) > 1: +- raise TypeError( +- "You can only give on positional argument") +- kw = args[0] +- ns = self.default_namespace.copy() +- ns.update(self.namespace) +- ns.update(kw) +- result = self._interpret(ns) +- return result +- +- def _interpret(self, ns): +- __traceback_hide__ = True +- parts = [] +- self._interpret_codes(self._parsed, ns, out=parts) +- return ''.join(parts) +- +- def _interpret_codes(self, codes, ns, out): +- __traceback_hide__ = True +- for item in codes: +- if isinstance(item, basestring): +- out.append(item) +- else: +- self._interpret_code(item, ns, out) +- +- def _interpret_code(self, code, ns, out): +- __traceback_hide__ = True +- name, pos = code[0], code[1] +- if name == 'py': +- self._exec(code[2], ns, pos) +- elif name == 'continue': +- raise _TemplateContinue() +- elif name == 'break': +- raise _TemplateBreak() +- elif name == 'for': +- vars, expr, content = code[2], code[3], code[4] +- expr = self._eval(expr, ns, pos) +- self._interpret_for(vars, expr, content, ns, out) +- elif name == 'cond': +- parts = code[2:] +- self._interpret_if(parts, ns, out) +- elif name == 'expr': +- parts = code[2].split('|') +- base = self._eval(parts[0], ns, pos) +- for part in parts[1:]: +- func = self._eval(part, ns, pos) +- base = func(base) +- out.append(self._repr(base, pos)) +- elif name == 'default': +- var, expr = code[2], code[3] +- if var not in ns: +- result = self._eval(expr, ns, pos) +- ns[var] = result +- elif name == 'comment': +- return +- else: +- assert 0, "Unknown code: %r" % name +- +- def _interpret_for(self, vars, expr, content, ns, out): +- __traceback_hide__ = True +- for item in expr: +- if len(vars) == 1: +- ns[vars[0]] = item +- else: +- if len(vars) != len(item): +- raise ValueError( +- 'Need %i items to unpack (got %i items)' +- % (len(vars), len(item))) +- for name, value in zip(vars, item): +- ns[name] = value +- try: +- self._interpret_codes(content, ns, out) +- except _TemplateContinue: +- continue +- except _TemplateBreak: +- break +- +- def _interpret_if(self, parts, ns, out): +- __traceback_hide__ = True +- # @@: if/else/else gets through +- for part in parts: +- assert not isinstance(part, basestring) +- name, pos = part[0], part[1] +- if name == 'else': +- result = True +- else: +- result = self._eval(part[2], ns, pos) +- if result: +- self._interpret_codes(part[3], ns, out) +- break +- +- def _eval(self, code, ns, pos): +- __traceback_hide__ = True +- try: +- value = eval(code, ns) +- return value +- except: +- exc_info = sys.exc_info() +- e = exc_info[1] +- if getattr(e, 'args'): +- arg0 = e.args[0] +- else: +- arg0 = str(e) +- e.args = (self._add_line_info(arg0, pos),) +- raise exc_info[0], e, exc_info[2] +- +- def _exec(self, code, ns, pos): +- __traceback_hide__ = True +- try: +- exec code in ns +- except: +- exc_info = sys.exc_info() +- e = exc_info[1] +- e.args = (self._add_line_info(e.args[0], pos),) +- raise exc_info[0], e, exc_info[2] +- +- def _repr(self, value, pos): +- __traceback_hide__ = True +- try: +- if value is None: +- return '' +- if self._unicode: +- try: +- value = unicode(value) +- except UnicodeDecodeError: +- value = str(value) +- else: +- value = str(value) +- except: +- exc_info = sys.exc_info() +- e = exc_info[1] +- e.args = (self._add_line_info(e.args[0], pos),) +- raise exc_info[0], e, exc_info[2] +- else: +- if self._unicode and isinstance(value, str): +- if not self.decode_encoding: +- raise UnicodeDecodeError( +- 'Cannot decode str value %r into unicode ' +- '(no default_encoding provided)' % value) +- value = value.decode(self.default_encoding) +- elif not self._unicode and isinstance(value, unicode): +- if not self.decode_encoding: +- raise UnicodeEncodeError( +- 'Cannot encode unicode value %r into str ' +- '(no default_encoding provided)' % value) +- value = value.encode(self.default_encoding) +- return value +- +- +- def _add_line_info(self, msg, pos): +- msg = "%s at line %s column %s" % ( +- msg, pos[0], pos[1]) +- if self.name: +- msg += " in file %s" % self.name +- return msg +- +-def sub(content, **kw): +- name = kw.get('__name') +- tmpl = Template(content, name=name) +- return tmpl.substitute(kw) +- return result +- +-def paste_script_template_renderer(content, vars, filename=None): +- tmpl = Template(content, name=filename) +- return tmpl.substitute(vars) +- +-class bunch(dict): +- +- def __init__(self, **kw): +- for name, value in kw.items(): +- setattr(self, name, value) +- +- def __setattr__(self, name, value): +- self[name] = value +- +- def __getattr__(self, name): +- try: +- return self[name] +- except KeyError: +- raise AttributeError(name) +- +- def __getitem__(self, key): +- if 'default' in self: +- try: +- return dict.__getitem__(self, key) +- except KeyError: +- return dict.__getitem__(self, 'default') +- else: +- return dict.__getitem__(self, key) +- +- def __repr__(self): +- items = [ +- (k, v) for k, v in self.items()] +- items.sort() +- return '<%s %s>' % ( +- self.__class__.__name__, +- ' '.join(['%s=%r' % (k, v) for k, v in items])) +- +-############################################################ +-## HTML Templating +-############################################################ +- +-class html(object): +- def __init__(self, value): +- self.value = value +- def __str__(self): +- return self.value +- def __repr__(self): +- return '<%s %r>' % ( +- self.__class__.__name__, self.value) +- +-def html_quote(value): +- if value is None: +- return '' +- if not isinstance(value, basestring): +- if hasattr(value, '__unicode__'): +- value = unicode(value) +- else: +- value = str(value) +- value = cgi.escape(value, 1) +- if isinstance(value, unicode): +- value = value.encode('ascii', 'xmlcharrefreplace') +- return value +- +-def url(v): +- if not isinstance(v, basestring): +- if hasattr(v, '__unicode__'): +- v = unicode(v) +- else: +- v = str(v) +- if isinstance(v, unicode): +- v = v.encode('utf8') +- return urllib.quote(v) +- +-def attr(**kw): +- kw = kw.items() +- kw.sort() +- parts = [] +- for name, value in kw: +- if value is None: +- continue +- if name.endswith('_'): +- name = name[:-1] +- parts.append('%s="%s"' % (html_quote(name), html_quote(value))) +- return html(' '.join(parts)) +- +-class HTMLTemplate(Template): +- +- default_namespace = Template.default_namespace.copy() +- default_namespace.update(dict( +- html=html, +- attr=attr, +- url=url, +- )) +- +- def _repr(self, value, pos): +- plain = Template._repr(self, value, pos) +- if isinstance(value, html): +- return plain +- else: +- return html_quote(plain) +- +-def sub_html(content, **kw): +- name = kw.get('__name') +- tmpl = HTMLTemplate(content, name=name) +- return tmpl.substitute(kw) +- return result +- +- +-############################################################ +-## Lexing and Parsing +-############################################################ +- +-def lex(s, name=None, trim_whitespace=True): +- """ +- Lex a string into chunks: +- +- >>> lex('hey') +- ['hey'] +- >>> lex('hey {{you}}') +- ['hey ', ('you', (1, 7))] +- >>> lex('hey {{') +- Traceback (most recent call last): +- ... +- TemplateError: No }} to finish last expression at line 1 column 7 +- >>> lex('hey }}') +- Traceback (most recent call last): +- ... +- TemplateError: }} outside expression at line 1 column 7 +- >>> lex('hey {{ {{') +- Traceback (most recent call last): +- ... +- TemplateError: {{ inside expression at line 1 column 10 +- +- """ +- in_expr = False +- chunks = [] +- last = 0 +- last_pos = (1, 1) +- for match in token_re.finditer(s): +- expr = match.group(0) +- pos = find_position(s, match.end()) +- if expr == '{{' and in_expr: +- raise TemplateError('{{ inside expression', position=pos, +- name=name) +- elif expr == '}}' and not in_expr: +- raise TemplateError('}} outside expression', position=pos, +- name=name) +- if expr == '{{': +- part = s[last:match.start()] +- if part: +- chunks.append(part) +- in_expr = True +- else: +- chunks.append((s[last:match.start()], last_pos)) +- in_expr = False +- last = match.end() +- last_pos = pos +- if in_expr: +- raise TemplateError('No }} to finish last expression', +- name=name, position=last_pos) +- part = s[last:] +- if part: +- chunks.append(part) +- if trim_whitespace: +- chunks = trim_lex(chunks) +- return chunks +- +-statement_re = re.compile(r'^(?:if |elif |else |for |py:)') +-single_statements = ['endif', 'endfor', 'continue', 'break'] +-trail_whitespace_re = re.compile(r'\n[\t ]*$') +-lead_whitespace_re = re.compile(r'^[\t ]*\n') +- +-def trim_lex(tokens): +- r""" +- Takes a lexed set of tokens, and removes whitespace when there is +- a directive on a line by itself: +- +- >>> tokens = lex('{{if x}}\nx\n{{endif}}\ny', trim_whitespace=False) +- >>> tokens +- [('if x', (1, 3)), '\nx\n', ('endif', (3, 3)), '\ny'] +- >>> trim_lex(tokens) +- [('if x', (1, 3)), 'x\n', ('endif', (3, 3)), 'y'] +- """ +- for i in range(len(tokens)): +- current = tokens[i] +- if isinstance(tokens[i], basestring): +- # we don't trim this +- continue +- item = current[0] +- if not statement_re.search(item) and item not in single_statements: +- continue +- if not i: +- prev = '' +- else: +- prev = tokens[i-1] +- if i+1 >= len(tokens): +- next = '' +- else: +- next = tokens[i+1] +- if (not isinstance(next, basestring) +- or not isinstance(prev, basestring)): +- continue +- if ((not prev or trail_whitespace_re.search(prev)) +- and (not next or lead_whitespace_re.search(next))): +- if prev: +- m = trail_whitespace_re.search(prev) +- # +1 to leave the leading \n on: +- prev = prev[:m.start()+1] +- tokens[i-1] = prev +- if next: +- m = lead_whitespace_re.search(next) +- next = next[m.end():] +- tokens[i+1] = next +- return tokens +- +- +-def find_position(string, index): +- """Given a string and index, return (line, column)""" +- leading = string[:index].splitlines() +- return (len(leading), len(leading[-1])+1) +- +-def parse(s, name=None): +- r""" +- Parses a string into a kind of AST +- +- >>> parse('{{x}}') +- [('expr', (1, 3), 'x')] +- >>> parse('foo') +- ['foo'] +- >>> parse('{{if x}}test{{endif}}') +- [('cond', (1, 3), ('if', (1, 3), 'x', ['test']))] +- >>> parse('series->{{for x in y}}x={{x}}{{endfor}}') +- ['series->', ('for', (1, 11), ('x',), 'y', ['x=', ('expr', (1, 27), 'x')])] +- >>> parse('{{for x, y in z:}}{{continue}}{{endfor}}') +- [('for', (1, 3), ('x', 'y'), 'z', [('continue', (1, 21))])] +- >>> parse('{{py:x=1}}') +- [('py', (1, 3), 'x=1')] +- >>> parse('{{if x}}a{{elif y}}b{{else}}c{{endif}}') +- [('cond', (1, 3), ('if', (1, 3), 'x', ['a']), ('elif', (1, 12), 'y', ['b']), ('else', (1, 23), None, ['c']))] +- +- Some exceptions:: +- +- >>> parse('{{continue}}') +- Traceback (most recent call last): +- ... +- TemplateError: continue outside of for loop at line 1 column 3 +- >>> parse('{{if x}}foo') +- Traceback (most recent call last): +- ... +- TemplateError: No {{endif}} at line 1 column 3 +- >>> parse('{{else}}') +- Traceback (most recent call last): +- ... +- TemplateError: else outside of an if block at line 1 column 3 +- >>> parse('{{if x}}{{for x in y}}{{endif}}{{endfor}}') +- Traceback (most recent call last): +- ... +- TemplateError: Unexpected endif at line 1 column 25 +- >>> parse('{{if}}{{endif}}') +- Traceback (most recent call last): +- ... +- TemplateError: if with no expression at line 1 column 3 +- >>> parse('{{for x y}}{{endfor}}') +- Traceback (most recent call last): +- ... +- TemplateError: Bad for (no "in") in 'x y' at line 1 column 3 +- >>> parse('{{py:x=1\ny=2}}') +- Traceback (most recent call last): +- ... +- TemplateError: Multi-line py blocks must start with a newline at line 1 column 3 +- """ +- tokens = lex(s, name=name) +- result = [] +- while tokens: +- next, tokens = parse_expr(tokens, name) +- result.append(next) +- return result +- +-def parse_expr(tokens, name, context=()): +- if isinstance(tokens[0], basestring): +- return tokens[0], tokens[1:] +- expr, pos = tokens[0] +- expr = expr.strip() +- if expr.startswith('py:'): +- expr = expr[3:].lstrip(' \t') +- if expr.startswith('\n'): +- expr = expr[1:] +- else: +- if '\n' in expr: +- raise TemplateError( +- 'Multi-line py blocks must start with a newline', +- position=pos, name=name) +- return ('py', pos, expr), tokens[1:] +- elif expr in ('continue', 'break'): +- if 'for' not in context: +- raise TemplateError( +- 'continue outside of for loop', +- position=pos, name=name) +- return (expr, pos), tokens[1:] +- elif expr.startswith('if '): +- return parse_cond(tokens, name, context) +- elif (expr.startswith('elif ') +- or expr == 'else'): +- raise TemplateError( +- '%s outside of an if block' % expr.split()[0], +- position=pos, name=name) +- elif expr in ('if', 'elif', 'for'): +- raise TemplateError( +- '%s with no expression' % expr, +- position=pos, name=name) +- elif expr in ('endif', 'endfor'): +- raise TemplateError( +- 'Unexpected %s' % expr, +- position=pos, name=name) +- elif expr.startswith('for '): +- return parse_for(tokens, name, context) +- elif expr.startswith('default '): +- return parse_default(tokens, name, context) +- elif expr.startswith('#'): +- return ('comment', pos, tokens[0][0]), tokens[1:] +- return ('expr', pos, tokens[0][0]), tokens[1:] +- +-def parse_cond(tokens, name, context): +- start = tokens[0][1] +- pieces = [] +- context = context + ('if',) +- while 1: +- if not tokens: +- raise TemplateError( +- 'Missing {{endif}}', +- position=start, name=name) +- if (isinstance(tokens[0], tuple) +- and tokens[0][0] == 'endif'): +- return ('cond', start) + tuple(pieces), tokens[1:] +- next, tokens = parse_one_cond(tokens, name, context) +- pieces.append(next) +- +-def parse_one_cond(tokens, name, context): +- (first, pos), tokens = tokens[0], tokens[1:] +- content = [] +- if first.endswith(':'): +- first = first[:-1] +- if first.startswith('if '): +- part = ('if', pos, first[3:].lstrip(), content) +- elif first.startswith('elif '): +- part = ('elif', pos, first[5:].lstrip(), content) +- elif first == 'else': +- part = ('else', pos, None, content) +- else: +- assert 0, "Unexpected token %r at %s" % (first, pos) +- while 1: +- if not tokens: +- raise TemplateError( +- 'No {{endif}}', +- position=pos, name=name) +- if (isinstance(tokens[0], tuple) +- and (tokens[0][0] == 'endif' +- or tokens[0][0].startswith('elif ') +- or tokens[0][0] == 'else')): +- return part, tokens +- next, tokens = parse_expr(tokens, name, context) +- content.append(next) +- +-def parse_for(tokens, name, context): +- first, pos = tokens[0] +- tokens = tokens[1:] +- context = ('for',) + context +- content = [] +- assert first.startswith('for ') +- if first.endswith(':'): +- first = first[:-1] +- first = first[3:].strip() +- match = in_re.search(first) +- if not match: +- raise TemplateError( +- 'Bad for (no "in") in %r' % first, +- position=pos, name=name) +- vars = first[:match.start()] +- if '(' in vars: +- raise TemplateError( +- 'You cannot have () in the variable section of a for loop (%r)' +- % vars, position=pos, name=name) +- vars = tuple([ +- v.strip() for v in first[:match.start()].split(',') +- if v.strip()]) +- expr = first[match.end():] +- while 1: +- if not tokens: +- raise TemplateError( +- 'No {{endfor}}', +- position=pos, name=name) +- if (isinstance(tokens[0], tuple) +- and tokens[0][0] == 'endfor'): +- return ('for', pos, vars, expr, content), tokens[1:] +- next, tokens = parse_expr(tokens, name, context) +- content.append(next) +- +-def parse_default(tokens, name, context): +- first, pos = tokens[0] +- assert first.startswith('default ') +- first = first.split(None, 1)[1] +- parts = first.split('=', 1) +- if len(parts) == 1: +- raise TemplateError( +- "Expression must be {{default var=value}}; no = found in %r" % first, +- position=pos, name=name) +- var = parts[0].strip() +- if ',' in var: +- raise TemplateError( +- "{{default x, y = ...}} is not supported", +- position=pos, name=name) +- if not var_re.search(var): +- raise TemplateError( +- "Not a valid variable name for {{default}}: %r" +- % var, position=pos, name=name) +- expr = parts[1].strip() +- return ('default', pos, var, expr), tokens[1:] +- +-_fill_command_usage = """\ +-%prog [OPTIONS] TEMPLATE arg=value +- +-Use py:arg=value to set a Python value; otherwise all values are +-strings. +-""" +- +-def fill_command(args=None): +- import sys, optparse, pkg_resources, os +- if args is None: +- args = sys.argv[1:] +- dist = pkg_resources.get_distribution('Paste') +- parser = optparse.OptionParser( +- version=str(dist), +- usage=_fill_command_usage) +- parser.add_option( +- '-o', '--output', +- dest='output', +- metavar="FILENAME", +- help="File to write output to (default stdout)") +- parser.add_option( +- '--html', +- dest='use_html', +- action='store_true', +- help="Use HTML style filling (including automatic HTML quoting)") +- parser.add_option( +- '--env', +- dest='use_env', +- action='store_true', +- help="Put the environment in as top-level variables") +- options, args = parser.parse_args(args) +- if len(args) < 1: +- print 'You must give a template filename' +- print dir(parser) +- assert 0 +- template_name = args[0] +- args = args[1:] +- vars = {} +- if options.use_env: +- vars.update(os.environ) +- for value in args: +- if '=' not in value: +- print 'Bad argument: %r' % value +- sys.exit(2) +- name, value = value.split('=', 1) +- if name.startswith('py:'): +- name = name[:3] +- value = eval(value) +- vars[name] = value +- if template_name == '-': +- template_content = sys.stdin.read() +- template_name = '' +- else: +- f = open(template_name, 'rb') +- template_content = f.read() +- f.close() +- if options.use_html: +- TemplateClass = HTMLTemplate +- else: +- TemplateClass = Template +- template = TemplateClass(template_content, name=template_name) +- result = template.substitute(vars) +- if options.output: +- f = open(options.output, 'wb') +- f.write(result) +- f.close() +- else: +- sys.stdout.write(result) +- +-if __name__ == '__main__': +- from paste.util.template import fill_command +- fill_command() +- +- diff --git a/SPECS/python-paste.spec b/SPECS/python-paste.spec new file mode 100644 index 00000000..f216dd5e --- /dev/null +++ b/SPECS/python-paste.spec @@ -0,0 +1,270 @@ +%if 0%{?fedora} || 0%{?rhel} > 6 +#global with_python3 1 +# paste is not python3 compatible at this time +%else +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif + +Name: python-paste +Version: 1.7.5.1 +Release: 9.20111221hg1498%{?dist} +Summary: Tools for using a Web Server Gateway Interface stack +Group: System Environment/Libraries +# Most of the code is MIT +# paste/exceptions/collector.py is ZPLv2.0 +# paste/evalexception/mochikit/MochiKit.js AFL or MIT +# paste/lint.py MIT or Apache v2 +# subproccess24.py PySourceColor.py, Python +# doctest24.py, Public Domain +License: MIT and ZPLv2.0 and Python and Public Domain and (AFL or MIT) and (MIT or ASL 2.0) +URL: http://pythonpaste.org +# All files arent included in the 0.7.5.1 release. Take a snapshot to get +# unittests working and pick up three bugfixes as well +# hg clone -r 1498 https://bitbucket.org/ianb/paste +# cd paste +# patch -p1 < ../paste-manifest.patch +# python setup.py sdist +# Source is in dist/Paste-1.7.5.1.tar.gz +Source0: Paste-%{version}.tar.gz +#Source0: http://pypi.python.org/pypi/packages/source/P/Paste/Paste-%{version}.tar.gz +# In one remaining place, make sure we check for string in the stdlib before we use our copy +Patch0: paste-unbundle-stdlib.patch +# Use a system version of python-tempita before our bundled copy +Patch1: paste-unbundle-tempita.patch +Patch2: paste-27-lambda.patch +# Fix parsing of digest key value pairs +# Submitted upstream pull request +Patch3: paste-digest-snap.patch +# Submitted upstream pull request with this change. +# This patch is needed when creating the tarball, not during rpm build +Patch100: paste-manifest.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-nose +BuildRequires: python-tempita +BuildRequires: pyOpenSSL +Requires: python-tempita +Requires: pyOpenSSL +Requires: python-setuptools + +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-nose +BuildRequires: python3-tempita +BuildRequires: /usr/bin/2to3 +%endif # if with_python3 + +%description +These provide several pieces of "middleware" (or filters) that can be nested +to build web applications. Each piece of middleware uses the WSGI (PEP 333) +interface, and should be compatible with other middleware based on those +interfaces. + +%if 0%{?with_python3} +%package -n python3-paste +Summary: Tools for using a Web Server Gateway Interface stack +Group: System Environment/Libraries +Requires: python3-tempita +Requires: python3-setuptools +# TODO is there a pyOpenSSL for python3 + +%description -n python3-paste +These provide several pieces of "middleware" (or filters) that can be nested +to build web applications. Each piece of middleware uses the WSGI (PEP 333) +interface, and should be compatible with other middleware based on those +interfaces. +%endif # with_python3 + + +%prep +%setup -q -n Paste-%{version} +%patch0 -p1 -b .stdlib +rm paste/util/subprocess24.py +%patch1 -p1 -b .tmpta +%patch2 -p1 -b .27lambda +%patch3 -p1 -b .digest +# Strip #! lines that make these seem like scripts +%{__sed} -i -e '/^#!.*/,1 d' paste/util/scgiserver.py paste/debug/doctest_webapp.py + +# clean docs directory +pushd docs +rm StyleGuide.txt +popd + +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +2to3 --write --nobackups %{py3dir} +%endif # with_python3 + +%build +%{__python} setup.py build + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 + + +%install +rm -rf %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT +popd +%endif # with_python3 + +%check +export PYTHONPATH=$(pwd) +# We don't have access to the wider internet in the buildsystem +nosetests -e '.*test_paste_website' + +%if 0%{?with_python3} +pushd %{py3dir} +export PYTHONPATH=$(pwd) +nosetests-%{python3_version} +popd +%endif # with_python3 + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc docs/* +%{python_sitelib}/* + +%if 0%{?with_python3} +%files -n python3-paste +%defattr(-,root,root,-) +%{python3_sitelib}/* +%endif + + +%changelog +* Fri Dec 27 2013 Daniel Mach - 1.7.5.1-9.20111221hg1498 +- Mass rebuild 2013-12-27 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.7.5.1-8.20111221hg1498 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 1.7.5.1-7.20111221hg1498 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jan 23 2012 Toshio Kuratomi - 1.7.5.1-6.20111221hg1498 +- Disable python3 subpackage as paste is not python3 compatible at this time + +* Sat Jan 14 2012 Fedora Release Engineering - 1.7.5.1-5.20111221hg1498 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 21 2011 Toshio Kuratomi - 1.7.5.1-4.20111221hg1498 +- Tarball is missing files, use a snapshot to get those files and also pick up + several bug fixes (one related to serving CGI scripts, another for http + Continue requests, and a third regarding digest authentication and internet + explorer) + +* Tue Dec 20 2011 Toshio Kuratomi - 1.7.5.1-3 +- Ugh. Enable unittests and make a note that the python3 module is totally + non-functional. Open a bug for that for the actual package maintainers to + make a decision on. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Sep 22 2010 Luke Macken - 1.7.5.1-1 +- 1.7.5.1 upstream release + +* Wed Sep 15 2010 Toshio Kuratomi - 1.7.5-1 +- New upstream bugfix + +* Mon Aug 23 2010 Toshio Kuratomi - 1.7.4-8 +- Rebuild for python3-3.2 + +* Mon Aug 2 2010 Kyle VanderBeek - 1.7.4-7 +- Add python3 version. +- Fix python 2.7/3 incompatible lambda syntax. +- Unbundle stdlib (2.4+) subprocess module (removed because it isn't even 3.x legal). + +* Fri Jul 30 2010 Toshio Kuratomi - 1.7.4-6 +- Include another function from tempita that is used by paste-script. + +* Thu Jul 22 2010 David Malcolm - 1.7.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Jul 9 2010 Toshio Kuratomi - 1.7.4-4 +- Actually apply the patches :-( + +* Fri Jul 2 2010 Toshio Kuratomi - 1.7.4-3 +- Require pyOpenSSL so that we get SSL capabilities + +* Thu Jul 1 2010 Toshio Kuratomi - 1.7.4-2 +- Unbundle tempita and don't rely on utils.string24 + +* Thu Jun 24 2010 Luke Macken - 1.7.4-1 +- 1.7.4 security release + +* Sun Jul 26 2009 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jun 22 2009 Kyle VanderBeek - 1.7.2-3 +- Package formerly ghost'ed .pyo files +- Update to current python package methods + +* Thu Feb 26 2009 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 06 2009 Luke Macken - 1.7.2-1 +- Update to 1.7.2 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.7.1-2 +- Rebuild for Python 2.6 + +* Sat Jun 14 2008 Luke Macken - 1.7.1-1 +- Update to Paste 1.7.1 + +* Thu Feb 28 2008 Luke Macken - 1.6-1 +- Update to 1.6 + +* Wed Oct 3 2007 Luke Macken - 1.4.2-1 +- 1.4.2 + +* Sun Sep 2 2007 Luke Macken - 1.4-2 +- Update for python-setuptools changes in rawhide + +* Sat Jul 8 2007 Luke Macken - 1.4-1 +- 1.4 + +* Sat Mar 3 2007 Luke Macken - 1.2.1-1 +- 1.2.1 + +* Sat Dec 9 2006 Luke Macken - 1.0-2 +- Add python-devel to BuildRequires +- 1.0 + +* Sun Sep 17 2006 Luke Macken - 0.9.8.1-1 +- 0.9.8.1 + +* Sun Sep 3 2006 Luke Macken - 0.9.3-5 +- Rebuild for FC6 + +* Wed Jul 19 2006 Luke Macken - 0.9.3-4 +- Use a smarter shebang removal expression + +* Wed Jul 19 2006 Luke Macken - 0.9.3-3 +- Fix doc inclusion + +* Sat Jul 15 2006 Luke Macken - 0.9.3-2 +- Clean up docs directory +- Remove shebang from from non-executable scripts +- Use consistent build root variables + +* Mon Jul 10 2006 Luke Macken - 0.9.3-1 +- Initial package