[Zope3-checkins] CVS: Zope3/src/zope/tales - expressions.py:1.4

Jim Fulton jim@zope.com
Tue, 20 May 2003 16:29:22 -0400


Update of /cvs-repository/Zope3/src/zope/tales
In directory cvs.zope.org:/tmp/cvs-serv31154/src/zope/tales

Modified Files:
	expressions.py 
Log Message:
Reformatted some excessively long lines.



=== Zope3/src/zope/tales/expressions.py 1.3 => 1.4 ===
--- Zope3/src/zope/tales/expressions.py:1.3	Thu May  1 15:35:50 2003
+++ Zope3/src/zope/tales/expressions.py	Tue May 20 16:29:21 2003
@@ -57,7 +57,8 @@
                     compiledpath.append(tuple(currentpath))
                     currentpath=[]
                 if not _valid_name(element[1:]):
-                    raise CompilerError, 'Invalid variable name "%s"' % element[1:]
+                    raise CompilerError('Invalid variable name "%s"'
+                                        % element[1:])
                 compiledpath.append(element[1:])
             else:
                 match = namespace_re.match(element)
@@ -67,13 +68,17 @@
                         currentpath=[]
                     namespace, functionname = match.groups()
                     if not _valid_name(namespace):
-                        raise CompilerError, 'Invalid namespace name "%s"' % namespace
+                        raise CompilerError('Invalid namespace name "%s"'
+                                            % namespace)
                     if not _valid_name(functionname):
-                        raise CompilerError, 'Invalid function name "%s"' % functionname
+                        raise CompilerError('Invalid function name "%s"'
+                                            % functionname)
                     try:
-                        compiledpath.append(self._engine.getFunctionNamespace(namespace))
+                        compiledpath.append(
+                            self._engine.getFunctionNamespace(namespace))
                     except KeyError:
-                        raise CompilerError, 'Unknown namespace "%s"' % namespace
+                        raise CompilerError('Unknown namespace "%s"'
+                                            % namespace)
                     currentpath.append(functionname)
                 else:
                     currentpath.append(element)
@@ -86,10 +91,12 @@
         
         if callable(first):
             # check for initial function
-            raise CompilerError,'Namespace function specified in first subpath element'
+            raise CompilerError(
+                'Namespace function specified in first subpath element')
         elif isinstance(first,StringTypes):
             # check for initial ?
-            raise CompilerError,'Dynamic name specified in first subpath element'
+            raise CompilerError(
+                'Dynamic name specified in first subpath element')
         
         if not _valid_name(base):
             raise CompilerError, 'Invalid variable name "%s"' % element