[Mpuls-commits] r1235 - wasko/branches/2.0/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-04 12:05:45 +0100 (Thu, 04 Feb 2010)
New Revision: 1235

Removed:
   wasko/branches/2.0/waskaweb/lib/filecache.py
Modified:
   wasko/branches/2.0/waskaweb/lib/navigation.py
Log:
* waskaweb/lib/navigation.py: (FileCache): Moved from lib/filecache as
it is only used here.
* waskaweb/lib/filecace.py: Deleted. Not imported anywhere anymore.


Deleted: wasko/branches/2.0/waskaweb/lib/filecache.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/filecache.py	2010-02-04 11:05:10 UTC (rev 1234)
+++ wasko/branches/2.0/waskaweb/lib/filecache.py	2010-02-04 11:05:45 UTC (rev 1235)
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
-# 
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS - 
-# Web-Anwendungs-Server fuer Kompetenzagenturen).
-# 
-# mpuls WASKA is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-# 
-# mpuls WASKA 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 Affero General Public
-# License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public
-# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-# 
-# mpuls WASKA has been developed on behalf of the 
-# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
-# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
-# European Social Fund resources.
-
-class FileCache(object):
-
-    def __init__(self, base=None):
-        self.base  = base
-        self.cache = {}
-
-    def get_image(self, name, attributes = ""):
-        return '<img src="%s" %s>' % (name, attributes)
-
-    def get_base(self):
-        return self.base
-
-# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:

Modified: wasko/branches/2.0/waskaweb/lib/navigation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/navigation.py	2010-02-04 11:05:10 UTC (rev 1234)
+++ wasko/branches/2.0/waskaweb/lib/navigation.py	2010-02-04 11:05:45 UTC (rev 1235)
@@ -40,7 +40,6 @@
 from formed.instance.backends.postgres import DBFactory as InstanceFactory
 
 from mpulsweb.lib.db import PostgresDBInterface
-from waskaweb.lib.filecache import FileCache
 
 SELECT_ITEM = u"/formularpage/select/%s"
 SELECT_BRANCH = u"/navigation/select_branch/%s"
@@ -91,7 +90,18 @@
     except:
         log.error('Can not find name for page %s' % page_id)
 
+class FileCache(object):
 
+    def __init__(self, base=None):
+        self.base  = base
+        self.cache = {}
+
+    def get_image(self, name, attributes = ""):
+        return '<img src="%s" %s>' % (name, attributes)
+
+    def get_base(self):
+        return self.base
+
 class TreeItem:
 
     def __init__(self, name, description, children=None, parent=None):