[z3-checkins] r36879 - z3/deliverance/DeliveranceDemo/trunk/ddemo

[ltucker at codespeak.net]

Author: ltucker
Date: Wed Jan 17 16:51:29 2007
New Revision: 36879

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
Log:
clean up attributes from filesystem

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	Wed Jan 17 16:51:29 2007
@@ -59,8 +59,9 @@
 
 class file_property(object):
 
-    def __init__(self, basename):
+    def __init__(self, basename, strip=False):
         self.basename = basename
+        self.strip = string
 
     def filename(self, obj):
         return os.path.join(obj.dir, self.basename)
@@ -73,6 +74,8 @@
         f = open(self.filename(obj), 'rb')
         c = f.read()
         f.close()
+        if self.strip:
+            c = c.strip()
         return c
 
     def __set__(self, obj, value):
@@ -126,10 +129,10 @@
     def static_dir(self):
         return os.path.join(self.dir, 'static')
     
-    remote = file_property('remote.txt')
-    theme_uri = file_property('theme_uri.txt')
-    theme_id = file_property('theme_id.txt')
-    rule_ids = file_property('rule_ids.txt')
+    remote = file_property('remote.txt', strip=True)
+    theme_uri = file_property('theme_uri.txt', strip=True)
+    theme_id = file_property('theme_id.txt', strip=True)
+    rule_ids = file_property('rule_ids.txt', strip=True)
 
     def set_rule_file(self, filename, content):
         filename = os.path.join(self.rule_dir, filename)