[z3-checkins] r47409 - z3/deliverance/DeliveranceVHoster/trunk/dvhoster

[ianb at codespeak.net]

Author: ianb
Date: Fri Oct 12 17:36:55 2007
New Revision: 47409

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py
Log:
Strip newlines off of some file contents (#211). Requires new/svn trunk of OHM.

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py	Fri Oct 12 17:36:55 2007
@@ -229,13 +229,13 @@
         return os.path.join(self.base_dir, 'static')
 
     remote_uris = descriptors.json_converter(
-        persist.file_property('remote_uris.txt'))
-    theme_uri = persist.file_property('theme_uri.txt')
+        persist.file_property('remote_uris.txt', strip=True))
+    theme_uri = persist.file_property('theme_uri.txt', strip=True)
     redirects = descriptors.json_converter(
-        persist.file_property('redirects.txt', default='[]'))
+        persist.file_property('redirects.txt', default='[]', strip=True))
 
     additional_request_headers = descriptors.json_converter(
-        persist.file_property('additional_request_headers.txt', default='[]'))
+        persist.file_property('additional_request_headers.txt', default='[]', strip=True))
 
     def aliases__rename(self, old_aliases, new_aliases):
         dropped = list(old_aliases)