- avoid excess string splitting

- add a note about how a TODO could be handled

1 files changed, 4 insertions, 1 deletions

diff --git a/talinterpreter.py b/talinterpreter.py
index 4b1136e..de25ae7 100644
--- a/talinterpreter.py
+++ b/talinterpreter.py
@@ -899,7 +899,7 @@ class TALInterpreter(object):
 
         # We want 'macroname' name to be always available as a variable
         outer = self.engine.getValue('macroname')
-        self.engine.setLocal('macroname', macroName.split('/')[-1])
+        self.engine.setLocal('macroname', macroName.rsplit('/', 1)[-1])
 
         prev_source = self.sourceFile
         wasInUse = self.inUseDirective
@@ -985,6 +985,9 @@ class TALInterpreter(object):
         try:
             self.interpret(block)
         # TODO: this should not catch ZODB.POSException.ConflictError.
+        # The ITALExpressionEngine interface should provide a way of
+        # getting the set of exception types that should not be
+        # handled.
         except:
             exc = sys.exc_info()[1]
             self.restoreState(state)