Changeset 150
- Timestamp:
- 05/10/02 17:37:54 (6 years ago)
- Files:
-
- trunk/RBFoundation/RBFoundation/XMLObjectify.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/JabberConnection.py (modified) (2 diffs)
- trunk/RBJabber/RBJabber/SubjectObserver/AttributedSubject.py (modified) (1 diff)
- trunk/RBSkinning/RBSkinning/xmlPython/PySkinObject.py (modified) (1 diff)
- trunk/RBSkinning/RBSkinning/xmlPython/evaluate.py (modified) (1 diff)
- trunk/RBSkinning/RBSkinning/xmlPython/inline.py (modified) (2 diffs)
- trunk/RBSkinning/RBSkinning/xmlPython/script.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBFoundation/RBFoundation/XMLObjectify.py
r147 r150 289 289 return self.__class__ 290 290 291 def _getAllElements(self, andData=0): 292 """Returns all elements.""" 293 return [x[-1] for x in self._elements if x[0][-1]] 294 291 295 def _getElements(self, node): 292 296 """Returns all elements matching node.""" trunk/RBJabber/RBJabber/JabberConnection.py
r149 r150 78 78 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 79 79 80 _socket = None 81 _parser = None 80 82 ServerJID = None 81 83 JabberNodeMap = {None: XMLBuilderObjectBase} … … 93 95 94 96 def __del__(self): 95 self.Shutdown() 97 if self: self.Shutdown() 98 99 def __nonzero__(self): 100 return self._socket and 1 or 0 96 101 97 102 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ trunk/RBJabber/RBJabber/SubjectObserver/AttributedSubject.py
r147 r150 52 52 def __getattribute__(self, name): 53 53 if '_' != name[0]: 54 result = self._attributes.get(name, None)55 if result is not None:54 result = self._attributes.get(name, self) 55 if result is not self: 56 56 return result 57 57 return super(AttributedSubjectMixin, self).__getattribute__(name) trunk/RBSkinning/RBSkinning/xmlPython/PySkinObject.py
r113 r150 56 56 self.object = self.ExecuteXML() 57 57 58 def ExecuteXML(self ):58 def ExecuteXML(self, **Variables): 59 59 return None 60 60 61 def _getLocals(self): 62 result = {'self': weakref.proxy(self)} 61 def _getLocals(self, Variables={}): 62 result = Variables.copy() 63 result['self'] = weakref.proxy(self) 64 result['context'] = weakref.proxy(self.context) 63 65 if self.parent(): 64 66 result['parentObj'] = self.parent().object trunk/RBSkinning/RBSkinning/xmlPython/evaluate.py
r113 r150 43 43 44 44 class evaluate(PySkinObject): 45 def ExecuteXML(self ):45 def ExecuteXML(self, **Variables): 46 46 code = ''.join(self.Content()) 47 47 if not code.strip(): code = self.settings['code'] 48 return eval(code, self.namespace, self._getLocals( ))48 return eval(code, self.namespace, self._getLocals(Variables)) 49 49 trunk/RBSkinning/RBSkinning/xmlPython/inline.py
r113 r150 53 53 default_settings['phase'] = 'finalize' 54 54 55 def ExecuteXML(self ):55 def ExecuteXML(self, **Variables): 56 56 content = self.Content() 57 57 trimWhitespace = '' … … 63 63 execCode = '%s\n' % ''.join(content).replace('\n' + trimWhitespace, '\n') 64 64 self.object = compile(execCode, 'xmlPython.inline', 'exec') 65 exec self.object in self.namespace, self._getLocals( )65 exec self.object in self.namespace, self._getLocals(Variables) 66 66 return self.object trunk/RBSkinning/RBSkinning/xmlPython/script.py
r126 r150 49 49 default_settings['kw'] = '{}' 50 50 51 def ExecuteXML(self ):51 def ExecuteXML(self, **Variables): 52 52 if self.context.__root__ not in sys.path: 53 53 sys.path.append(self.context.__root__) … … 56 56 reload(module) 57 57 call = getattr(module, self.settings['call']) 58 args = eval(self.settings['args'], self.namespace, self._getLocals( ))59 kw = eval(self.settings['kw'], self.namespace, self._getLocals( ))58 args = eval(self.settings['args'], self.namespace, self._getLocals(Variables)) 59 kw = eval(self.settings['kw'], self.namespace, self._getLocals(Variables)) 60 60 return apply(call, args, kw)
