Changeset 646

Timestamp:

01/09/14 16:01:15 (9 years ago)

Author:

bas

Message:

Fixid agilo ticket model import for old and new versions, closes #330

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (1 diff)

trunk/ChangeLog

@@ -28 +28 @@
     Reported by: kshetriamrit add gmail dot com
     Fixed by: Bas van der Vlies
+
+  * New version of trac agilo has changed the import for ticket model. First try new
+    import statement and as fallback use old one, closes #331
+    Reported by: sebastian at djangsters dot de
+    Fixed by: Bas van der Vlies
+
+2.7.0
 
 2.7.0

trunk/email2trac.py.in

@@ -2839 +2839 @@
 
                 try:
-                    #from agilo.utils.config import AgiloConfig
-                    #if AgiloConfig(self.env).is_agilo_enabled:
-                    from agilo.ticket.model import Ticket 
+
+                    from agilo.ticket.model import AgiloTicket as Ticket 
+
                 except ImportError, detail: 
-                    logger.error('Could not find Trac  Agilo environemnt')
-                    sys.exit(0)
+
+                    try:
+                        from agilo.ticket.model import Ticket 
+                    except ImportError, detail: 
+                        logger.error('Could not find Trac  Agilo environemnt')
+                        sys.exit(0)
 
             else: