diff pylons_app/controllers/admin.py @ 252:3782a6d698af

licensing updates, code cleanups
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 04 Jun 2010 13:08:29 +0200
parents fcab58c43ea1
children 61be6dcd49a0
line wrap: on
line diff
--- a/pylons_app/controllers/admin.py	Fri Jun 04 11:29:05 2010 +0200
+++ b/pylons_app/controllers/admin.py	Fri Jun 04 13:08:29 2010 +0200
@@ -1,6 +1,29 @@
+#!/usr/bin/env python
+# encoding: utf-8
+# admin controller for pylons 
+# Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+ 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License or (at your opinion) any later version of the license.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+"""
+Created on April 7, 2010
+admin controller for pylons
+@author: marcink
+"""
 import logging
-from pylons import request, response, session, tmpl_context as c, url, app_globals as g
-from pylons.controllers.util import abort, redirect
+from pylons import request, response, session, tmpl_context as c
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model import meta
 from pylons_app.model.db import UserLog