Changeset 1691 for trunk

Timestamp:

02/10/10 13:18:11 (15 years ago)

Author:

Malte Marquarding

Message:

Add compatibility.py for functools.wraps which doesn't exist in python <2.5

Location:

trunk/python

Files:

• __init__.py (modified) (3 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/__init__.py

@@ -4 +4 @@
 """
 import os,sys,shutil, platform
-import functools
+try:
+    from functools import wraps as wraps_dec
+except ImportError:
+    from asap.compatibility import wraps as wraps_dec
 
 # Set up AIPSPATH and first time use of asap i.e. ~/.asap/*
@@ -357 +360 @@
 
 def print_log_dec(f):
-    @functools.wraps(f)
+    @wraps_dec(f)
     def wrap_it(*args, **kw):
         val = f(*args, **kw)
@@ -398 +401 @@
             import matplotlib
             matplotlib.use("TkAgg")
-        import pylab
+        from matplotlib import pylab
         xyplotter = pylab
         plotter = asapplotter(gui)

trunk/python/scantable.py

@@ -1 @@
-import functools
+try:
+    from functools import wraps as wraps_dec
+except ImportError:
+    from asap.compatibility import wraps as wraps_dec
+
 from asap._asap import Scantable
 from asap import rcParams
@@ -11 +15 @@
 
 def preserve_selection(func):
-    @functools.wraps(func)
+    @wraps_dec(func)
     def wrap(obj, *args, **kw):
         basesel = obj.get_selection()