equal
deleted
inserted
replaced
49 server_port = FieldProperty(IZEOConnection['server_port']) |
49 server_port = FieldProperty(IZEOConnection['server_port']) |
50 storage = FieldProperty(IZEOConnection['storage']) |
50 storage = FieldProperty(IZEOConnection['storage']) |
51 username = FieldProperty(IZEOConnection['username']) |
51 username = FieldProperty(IZEOConnection['username']) |
52 password = FieldProperty(IZEOConnection['password']) |
52 password = FieldProperty(IZEOConnection['password']) |
53 server_realm = FieldProperty(IZEOConnection['server_realm']) |
53 server_realm = FieldProperty(IZEOConnection['server_realm']) |
|
54 blob_dir = FieldProperty(IZEOConnection['blob_dir']) |
|
55 shared_blob_dir = FieldProperty(IZEOConnection['shared_blob_dir']) |
54 |
56 |
55 def getSettings(self): |
57 def getSettings(self): |
56 result = {} |
58 result = {} |
57 for name in getFieldNames(IZEOConnection): |
59 for name in getFieldNames(IZEOConnection): |
58 result[name] = getattr(self, name) |
60 result[name] = getattr(self, name) |
69 storage = ClientStorage.ClientStorage((str(self.server_name), self.server_port), |
71 storage = ClientStorage.ClientStorage((str(self.server_name), self.server_port), |
70 storage=self.storage, |
72 storage=self.storage, |
71 username=self.username or '', |
73 username=self.username or '', |
72 password=self.password or '', |
74 password=self.password or '', |
73 realm=self.server_realm, |
75 realm=self.server_realm, |
|
76 blob_dir=self.blob_dir, |
|
77 shared_blob_dir=self.shared_blob_dir, |
74 wait=wait) |
78 wait=wait) |
75 db = DB(storage) |
79 db = DB(storage) |
76 return (storage, db) if get_storage else db |
80 return (storage, db) if get_storage else db |
77 |
81 |
78 |
82 |