Changeset 39

Timestamp:

25/01/05 09:14:30 (7 years ago)

Author:

steve

Message:

Patched for jython 2.1 compatibility

Location:

trunk

Files:

• airspeed.py (modified) (5 diffs)
• airspeed_test.py (modified) (1 diff)

trunk/airspeed.py

@@ -8 +8 @@
 __all__ = ['Template', 'TemplateError', 'TemplateSyntaxError', 'CachingFileLoader']
 
+
+###############################################################################
+# Compatibility for old Pythons & Jython
+###############################################################################
+try: True
+except NameError:
+    False, True = 0, 1
+try: dict
+except NameError:
+    from UserDict import UserDict
+    class dict(UserDict):
+        def __init__(self): self.data = {}
+try: operator.__gt__
+except AttributeError:
+    operator.__gt__ = lambda a, b: a > b
+    operator.__lt__ = lambda a, b: a < b
+    operator.__ge__ = lambda a, b: a >= b
+    operator.__le__ = lambda a, b: a <= b
+    operator.__eq__ = lambda a, b: a == b
+    operator.__ne__ = lambda a, b: a != b
 
 ###############################################################################
@@ -85 +105 @@
     def load_template(self, name):
         mtime = os.path.getmtime(self.filename_of(name))
-        if name in self.known_templates:
+        if self.known_templates.has_key(name):
             template, prev_mtime = self.known_templates[name]
             if mtime <= prev_mtime:
@@ -268 +288 @@
 
     def calculate(self, namespace, loader):
-        for value in self.values:
-            yield value.calculate(namespace, loader)
+        return [value.calculate(namespace, loader) for value in self.values]
 
 
@@ -534 +553 @@
     def evaluate(self, stream, namespace, loader):
         macro_key = '#' + self.macro_name.lower()
-        if macro_key in namespace:
+        if namespace.has_key(macro_key):
             raise Exception("cannot redefine macro")
         namespace[macro_key] = self
@@ -637 +656 @@
         counter = 1
         try:
+            if hasattr(iterable, 'keys'): iterable = iterable.keys()
+            if not hasattr(iterable, '__getitem__'):
+                raise AttributeError("value for $%s is not iterable in #foreach: %s" % (self.loop_var_name, iterable))
             for item in iterable:
                 namespace = LocalNamespace(namespace)

trunk/airspeed_test.py

@@ -3 +3 @@
 from unittest import TestCase, main
 import airspeed
+
+###############################################################################
+# Compatibility for old Pythons & Jython
+###############################################################################
+try: True
+except NameError:
+    False, True = 0, 1