Merge commit 'refs/merge-requests/59' of git://gitorious.org/mediagoblin/mediagoblin...

[mediagoblin.git] / mediagoblin / auth / routing.py

diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py
index 58faa5a34d1365e288c464724032d993048d15cc..2a6abb47df4a0ce608acdcc9096419192bc1230d 100644 (file)
--- a/mediagoblin/auth/routing.py
+++ b/mediagoblin/auth/routing.py
@@ -14,36 +14,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from routes.route import add_route
-from mediagoblin.routing import add_route
 
-add_route('mediagoblin.auth.logout',
-          '/auth/logout/', 'mediagoblin.auth.views:logout')
-
-
-add_route('mediagoblin.auth.register', '/register/',
-        'mediagoblin.auth.views:register')
-
-add_route('mediagoblin.auth.login', '/login/',
-        'mediagoblin.auth.views:login')
-
-add_route('mediagoblin.auth.logout', '/logout/',
-        'mediagoblin.auth.views:logout')
-
-add_route('mediagoblin.auth.verify_email', '/verify_email/',
-        'mediagoblin.auth.views:verify_email')
-
-add_route('mediagoblin.auth.resend_verification', '/resend_verification/',
-        'mediagoblin.auth.views:resend_activation')
-
-add_route('mediagoblin.auth.resend_verification_success',
-        '/resend_verification_success/',
-        template='mediagoblin/auth/resent_verification_email.html',
-        'mediagoblin.views:simple_template_render')
-
-add_route('mediagoblin.auth.forgot_password', '/forgot_password/',
-        'mediagoblin.auth.views:forgot_password')
-
-add_route('mediagoblin.auth.verify_forgot_password',
-        '/forgot_password/verify/',
-        'mediagoblin.auth.views:verify_forgot_password')
+auth_routes = [
+    ('mediagoblin.auth.register', '/register/',
+     'mediagoblin.auth.views:register'),
+    ('mediagoblin.auth.login', '/login/',
+     'mediagoblin.auth.views:login'),
+    ('mediagoblin.auth.logout', '/logout/',
+     'mediagoblin.auth.views:logout'),
+    ('mediagoblin.auth.verify_email', '/verify_email/',
+     'mediagoblin.auth.views:verify_email'),
+    ('mediagoblin.auth.resend_verification', '/resend_verification/',
+     'mediagoblin.auth.views:resend_activation'),
+    ('mediagoblin.auth.forgot_password', '/forgot_password/',
+     'mediagoblin.auth.views:forgot_password'),
+    ('mediagoblin.auth.verify_forgot_password',
+     '/forgot_password/verify/',
+     'mediagoblin.auth.views:verify_forgot_password')]