From 2849c82255b4b889c7342a0a8fa8a4aecfbe599d Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sat, 17 Jan 2015 16:50:38 +0100
Subject: a first big refacto of the existing arch

---
 pyaggr3g470r/decorators.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'pyaggr3g470r/decorators.py')

diff --git a/pyaggr3g470r/decorators.py b/pyaggr3g470r/decorators.py
index 3e808793..a13dacac 100644
--- a/pyaggr3g470r/decorators.py
+++ b/pyaggr3g470r/decorators.py
@@ -5,8 +5,11 @@ from threading import Thread
 from functools import wraps
 
 from flask import g, redirect, url_for, flash
+from flask.ext.babel import gettext
+from flask.ext.login import login_required
 
 from pyaggr3g470r.models import Feed
+from pyaggr3g470r.lib.exceptions import PyAggError
 
 
 def async(f):
@@ -37,3 +40,23 @@ def feed_access_required(func):
         else:
             return func(*args, **kwargs)
     return decorated
+
+
+def handle_pyagg_error(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except PyAggError, error:
+            flash(gettext(error.default_message), 'warning')
+            return redirect(url_for('home'))
+    return wrapper
+
+
+def pyagg_default_decorator(func):
+    @login_required
+    @handle_pyagg_error
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+    return wrapper
-- 
cgit 


From 4f0ad9e442e64f69d420dea4d737805eefaaf981 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 21 Jan 2015 14:07:00 +0100
Subject: continuing refacto

---
 pyaggr3g470r/decorators.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pyaggr3g470r/decorators.py')

diff --git a/pyaggr3g470r/decorators.py b/pyaggr3g470r/decorators.py
index a13dacac..9bae626d 100644
--- a/pyaggr3g470r/decorators.py
+++ b/pyaggr3g470r/decorators.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 from threading import Thread
 from functools import wraps
@@ -23,6 +23,7 @@ def async(f):
         thr.start()
     return wrapper
 
+
 def feed_access_required(func):
     """
     This decorator enables to check if a user has access to a feed.
@@ -47,7 +48,7 @@ def handle_pyagg_error(func):
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except PyAggError, error:
+        except PyAggError as error:
             flash(gettext(error.default_message), 'warning')
             return redirect(url_for('home'))
     return wrapper
-- 
cgit 


From a4fb151ea53d8054cc8e3fb309395c8fa0e23aaf Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 1 Mar 2015 14:08:02 +0100
Subject: fixing/restoring logging level

---
 pyaggr3g470r/decorators.py | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'pyaggr3g470r/decorators.py')

diff --git a/pyaggr3g470r/decorators.py b/pyaggr3g470r/decorators.py
index 9bae626d..9e8f9c0b 100644
--- a/pyaggr3g470r/decorators.py
+++ b/pyaggr3g470r/decorators.py
@@ -9,7 +9,6 @@ from flask.ext.babel import gettext
 from flask.ext.login import login_required
 
 from pyaggr3g470r.models import Feed
-from pyaggr3g470r.lib.exceptions import PyAggError
 
 
 def async(f):
@@ -43,20 +42,8 @@ def feed_access_required(func):
     return decorated
 
 
-def handle_pyagg_error(func):
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except PyAggError as error:
-            flash(gettext(error.default_message), 'warning')
-            return redirect(url_for('home'))
-    return wrapper
-
-
 def pyagg_default_decorator(func):
     @login_required
-    @handle_pyagg_error
     @wraps(func)
     def wrapper(*args, **kwargs):
         return func(*args, **kwargs)
-- 
cgit