| 
														
															@@ -144,18 +144,18 @@ class Demeter(object): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		return salt 
														 | 
														
														 | 
														
															 		return salt 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@staticmethod 
														 | 
														
														 | 
														
															 	@staticmethod 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-	def mktime(value, str='%Y-%m-%d %H:%M:%S'): 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+	def mktime(value, string='%Y-%m-%d %H:%M:%S'): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		module = __import__('time') 
														 | 
														
														 | 
														
															 		module = __import__('time') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		strptime = getattr(module, 'strptime') 
														 | 
														
														 | 
														
															 		strptime = getattr(module, 'strptime') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		mktime = getattr(module, 'mktime') 
														 | 
														
														 | 
														
															 		mktime = getattr(module, 'mktime') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		return int(mktime(strptime(value,str))) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		return int(mktime(strptime(value,string))) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@staticmethod 
														 | 
														
														 | 
														
															 	@staticmethod 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-	def date(value, str='%Y-%m-%d %H:%M:%S'): 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+	def date(value, string='%Y-%m-%d %H:%M:%S'): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		module = __import__('datetime') 
														 | 
														
														 | 
														
															 		module = __import__('datetime') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		datetime = getattr(module, 'datetime') 
														 | 
														
														 | 
														
															 		datetime = getattr(module, 'datetime') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		fromtimestamp = getattr(datetime, 'fromtimestamp') 
														 | 
														
														 | 
														
															 		fromtimestamp = getattr(datetime, 'fromtimestamp') 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		return str(fromtimestamp(value).strftime(str)) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		return str(fromtimestamp(value).strftime(string)) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@staticmethod 
														 | 
														
														 | 
														
															 	@staticmethod 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	def error(string): 
														 | 
														
														 | 
														
															 	def error(string): 
														 |