1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
|
Description: Another py3 patch
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2018-02-17
--- python-stringtemplate3-3.1.orig/stringtemplate3/groups.py
+++ python-stringtemplate3-3.1/stringtemplate3/groups.py
@@ -663,7 +663,7 @@ class StringTemplateGroup(object):
parser = GroupParser.Parser(lexer)
parser.group(self)
# sys.stderr.write("read group\n" + str(self))
- except "foo", e: # FIXME: Exception, e:
+ except "foo" as e: # FIXME: Exception, e:
name = "<unknown>"
if self.name:
name = self.name
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/ActionEvaluator.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/ActionEvaluator.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
from six import StringIO
from stringtemplate3.language.CatIterator import CatList
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/ActionLexer.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/ActionLexer.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
from stringtemplate3.language.StringTemplateToken import StringTemplateToken
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/ActionParser.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/ActionParser.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
from stringtemplate3.language.StringTemplateToken import StringTemplateToken
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/AngleBracketTemplateLexer.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/AngleBracketTemplateLexer.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
import six
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/DefaultTemplateLexer.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/DefaultTemplateLexer.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
import six
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/GroupLexer.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/GroupLexer.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
from ASTExpr import *
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/GroupParser.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/GroupParser.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
from ASTExpr import *
import stringtemplate3
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/InterfaceLexer.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/InterfaceLexer.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
#
# [The "BSD licence"]
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/InterfaceParser.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/InterfaceParser.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
#
# [The "BSD licence"]
--- python-stringtemplate3-3.1.orig/stringtemplate3/language/TemplateParser.py
+++ python-stringtemplate3-3.1/stringtemplate3/language/TemplateParser.py
@@ -3,11 +3,6 @@
import sys
import antlr
-version = sys.version.split()[0]
-if version < '2.2.1':
- False = 0
-if version < '2.3':
- True = not False
### header action >>>
import stringtemplate3
from stringtemplate3.language.ChunkToken import ChunkToken
|