5656
5757__all__ = ['Session' ]
5858
59- DEFAULT_RESOURCE_EXPIRE_TIME = 60 * 60
60- DEFAULT_STORE_KEY = 'default'
59+ DEFAULT_RESOURCE_EXPIRE_TIME = 60 * 60
60+ DEFAULT_STORE_KEY = 'default'
6161
6262class Session (object ):
6363 """ The `Session` will manage the rest of the components in **SuRF**,
@@ -87,8 +87,8 @@ def __init__(self, default_store=None, mapping=None, auto_persist=False, auto_lo
8787 self ._auto_load = auto_load
8888 self ._stores = {}
8989
90- if default_store :
91- if type (default_store ) is not Store :
90+ if default_store is not None :
91+ if not isinstance (default_store , Store ) :
9292 raise Exception ('the arguments is not a valid Store instance' )
9393 self .default_store = default_store
9494
@@ -106,7 +106,7 @@ def __setitem__(self, key, value):
106106 """ Set the `store` for the specified key, if value not a `Store`
107107 instance ignored. """
108108
109- if type (value ) is Store :
109+ if type (value ) is Store :
110110 self ._stores [key ] = value
111111
112112 def __delitem__ (self , key ):
@@ -160,7 +160,7 @@ def auto_load(self, val):
160160
161161 @property
162162 def log_level (self ):
163- return { sid : store .log_level for sid , store in self ._stores .iteritems ()}
163+ return dict (( sid , store .log_level ) for sid , store in self ._stores .iteritems ())
164164
165165 @log_level .setter
166166 def log_level (self , level ):
@@ -181,55 +181,37 @@ def set_cache_expire(self,val):
181181 fset = set_cache_expire)
182182 '''
183183
184- def get_default_store_key (self ):
185- """ Getter function for the `default_store_key` property.
186-
187- Do not use this, use the `default_store_key` property instead.
188-
184+ @property
185+ def default_store_key (self ):
189186 """
187+ The `default store key` of the session.
190188
189+ If it is set explicitly on `session` creation it is returned, else the first `store key` is returned.
190+ If no `stores` are in the session None is returned.
191+ """
191192 if DEFAULT_STORE_KEY in self ._stores :
192193 return DEFAULT_STORE_KEY
193194 elif len (self ._stores ) > 0 :
194195 return self ._stores .keys ()[0 ]
195196 return None
196197
197- default_store_key = property (fget = get_default_store_key )
198- """ The `default store key` of the session.
199-
200- If it is set explicitly on `session` creation it is returned,
201- else the first `store key` is returned. If no `stores` are in the session
202- None is returned. """
203-
204-
205- def set_default_store (self , store ):
206- """ Setter function for the `default_store` property.
207-
208- Do not use this, use the `default_store` property instead.
209-
198+ @property
199+ def default_store (self ):
210200 """
201+ The `default store` of the session.
211202
212- self .__setitem__ (DEFAULT_STORE_KEY , store )
213-
214- def get_default_store (self ):
215- """ Getter function for the `default_store` property.
216-
217- Do not use this, use the `default_store` property instead.
218-
203+ See `default_store_key` to see how the `default store` is selected.
219204 """
220-
221205 ds_key = self .default_store_key
222206 if ds_key :
223207 return self ._stores [ds_key ]
224208 return None
225209
226- default_store = property (fget = get_default_store ,
227- fset = set_default_store )
228- """ The `default store` of the session.
229-
230- See `default_store_key` to see how the `default store` is selected. """
210+ @default_store .setter
211+ def default_store (self , store ):
212+ self .__setitem__ (DEFAULT_STORE_KEY , store )
231213
232- def __uri (self , uri ):
214+ def _uri (self , uri ):
233215 """ For **internal** use only, convert the `uri` to a `URIRef`. """
234216
235217 if not uri :
@@ -260,7 +242,7 @@ def close(self):
260242
261243 self .mapping = None
262244
263- def map_type (self , uri , store = None , classes = None ):
245+ def map_type (self , uri , store = None , classes = None ):
264246 """ Create and return a `class` based on the `uri` given.
265247
266248 Also will add the `classes` to the inheritance list.
@@ -270,7 +252,7 @@ def map_type(self, uri, store = None, classes = None):
270252 classes = classes if isinstance (classes , (tuple , set , list )) else []
271253 store = store if store else self .default_store_key
272254
273- uri = self .__uri (uri )
255+ uri = self ._uri (uri )
274256 if not uri :
275257 return None
276258 name = uri_to_classname (uri )
@@ -283,11 +265,11 @@ def map_type(self, uri, store = None, classes = None):
283265 if type (session_classes ) not in list , tuple , set ]:
284266 session_classes = [session_classes ]
285267 base_classes .extend (session_classes )
286- return type (str (name ), tuple (base_classes ), {'uri' : uri ,
287- 'store_key' : store ,
288- 'session' : self })
268+ return type (str (name ), tuple (base_classes ), {'uri' : uri ,
269+ 'store_key' : store ,
270+ 'session' : self })
289271
290- def get_class (self , uri , store = None , classes = None ):
272+ def get_class (self , uri , store = None , classes = None ):
291273 """
292274 See :func:`surf.session.Session.map_type`.
293275 The `uri` parameter can be any of the following:
@@ -301,10 +283,10 @@ def get_class(self, uri, store = None, classes = None):
301283
302284 """
303285
304- return self .map_type (uri , store = store , classes = classes )
286+ return self .map_type (uri , store = store , classes = classes )
305287
306- def map_instance (self , concept , subject , store = None , classes = None ,
307- block_auto_load = False , context = None ):
288+ def map_instance (self , concept , subject , store = None , classes = None ,
289+ block_auto_load = False , context = None ):
308290 """Create an `instance` of the `class` specified by `uri` and `classes`
309291 to be inherited, see `map_type` for more information. """
310292
@@ -317,13 +299,12 @@ def map_instance(self, concept, subject, store = None, classes = None,
317299 store = self .default_store_key
318300
319301 if not (isinstance (concept , type ) and issubclass (concept , Resource )):
320- concept = self .map_type (concept , store = store , classes = classes )
321-
322- return concept (subject , block_auto_load = block_auto_load , context = context )
302+ concept = self .map_type (concept , store = store , classes = classes )
323303
304+ return concept (subject , block_auto_load = block_auto_load , context = context )
324305
325- def get_resource (self , subject , concept = None , store = None , graph = None ,
326- block_auto_load = False , context = None , classes = None ):
306+ def get_resource (self , subject , concept = None , store = None , graph = None ,
307+ block_auto_load = False , context = None , classes = None ):
327308 """ Same as `map_type` but `set` the resource from the `graph`. """
328309
329310 classes = classes if isinstance (classes , (tuple , set , list )) else []
@@ -334,17 +315,17 @@ def get_resource(self, subject, concept = None, store = None, graph = None,
334315 if concept is None :
335316 concept = Resource .concept (subject )
336317
337- resource = self .map_instance (concept , subject , store = store , classes = classes ,
338- block_auto_load = block_auto_load ,
339- context = context )
318+ resource = self .map_instance (concept , subject , store = store , classes = classes ,
319+ block_auto_load = block_auto_load ,
320+ context = context )
340321
341322 if graph :
342323 resource .set (graph )
343324
344325 return resource
345326
346- def load_resource (self , uri , subject , store = None , data = None ,
347- file = None , location = None , format = None , classes = None ):
327+ def load_resource (self , uri , subject , store = None , data = None ,
328+ file = None , location = None , format = None , classes = None ):
348329 """ Create an `instance` of the `class` specified by `uri`, while
349330 `subject` is the subject of the new resource instance.
350331
@@ -359,11 +340,11 @@ def load_resource(self, uri, subject, store = None, data = None,
359340 """
360341 classes = classes if isinstance (classes , (tuple , set , list )) else []
361342
362- ResourceClass = self .map_type (uri , store = store , classes = classes )
343+ ResourceClass = self .map_type (uri , store = store , classes = classes )
363344 if ResourceClass :
364345 resource = ResourceClass (subject )
365- resource .load_from_source (data = data , file = file ,
366- location = location , format = format )
346+ resource .load_from_source (data = data , file = file ,
347+ location = location , format = format )
367348 return resource
368349 return None
369350
0 commit comments