Pull fix from upstream to fix problem with python 2.7.

martynas@ ok.
This commit is contained in:
fgsch 2011-07-14 22:34:55 +00:00
parent 8ed702097f
commit 5715404d89
2 changed files with 20 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2011/06/08 18:15:29 rpointel Exp $
# $OpenBSD: Makefile,v 1.22 2011/07/14 22:34:55 fgsch Exp $
COMMENT = wiki engine written in python
MODPY_EGG_VERSION = 1.9.3
DISTNAME = moin-${MODPY_EGG_VERSION}
PKGNAME = moin${DISTNAME}
REVISION = 1
REVISION = 2
CATEGORIES = www

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-MoinMoin_support_werkzeug_templates_py,v 1.1 2011/07/14 22:34:55 fgsch Exp $
werkzeug: Removed a dummy import. Not only is it unnecessary, but also no
longer supported in Python 2.7. This fixes #447 (werkzeug bugtracker).
Patch from upstream Mercurial:
http://hg.moinmo.in/moin/1.9/rev/a4a7f275b7b3
--- MoinMoin/support/werkzeug/templates.py.orig Thu Jul 14 01:24:37 2011
+++ MoinMoin/support/werkzeug/templates.py Thu Jul 14 01:24:44 2011
@@ -12,7 +12,6 @@ import sys
import re
import __builtin__ as builtins
from compiler import ast, parse
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
from compiler.pycodegen import ModuleCodeGenerator
from tokenize import PseudoToken
from werkzeug import utils