From 4117503ed5f2229c54df68bc9ab339f7ea7cb36d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 25 Sep 2010 15:23:01 -0400 Subject: [PATCH] Elegant imports in place! --- tablib/core.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tablib/core.py b/tablib/core.py index e368bab..9500d20 100644 --- a/tablib/core.py +++ b/tablib/core.py @@ -76,8 +76,12 @@ class Dataset(object): """Adds format properties.""" for fmt in formats: try: - setattr(cls, fmt.title, property(fmt.export_set)) - except Exception: + try: + setattr(cls, fmt.title, property(fmt.export_set, fmt.import_set)) + except AttributeError: + setattr(cls, fmt.title, property(fmt.export_set)) + + except AttributeError: pass @@ -234,8 +238,12 @@ class Databook(object): """Adds format properties.""" for fmt in formats: try: - setattr(cls, fmt.title, property(fmt.export_book)) - except Exception: + try: + setattr(cls, fmt.title, property(fmt.export_book, fmt.import_book)) + except AttributeError: + setattr(cls, fmt.title, property(fmt.export_book)) + + except AttributeError: pass