Make modules have attributes and call methods in them

Author: ncw

py/internal.go

@@ -125,6 +125,18 @@ func SetItem(self Object, key Object, value Object) Object{
 
 // GetAttrOrNil - returns the result nil if attribute not found
 funcGetAttrOrNil(selfObject, keystring) (resObject){
+deferfunc(){
+ifr:=recover(); r!=nil{
+ifIsException(AttributeError, r){
+// AttributeError caught - return nil
+res=nil
+ } else{
+// Propagate the exception
+panic(r)
+ }
+ }
+ }()
+
 // Call __getattribute unconditionally if it exists
 ifI, ok:=self.(I__getattribute__); ok{
 res=I.M__getattribute__(key)

py/module.go

@@ -52,3 +52,26 @@ func NewModule(name, doc string, methods []*Method, globals StringDict) *Module
 fmt.Printf("Registering module %q\n", name)
 returnm
 }
+
+// Calls a named method of a module
+func (m*Module) Call(namestring, argsTuple, kwargsStringDict) Object{
+returnCall(m.M__getattribute__(name), args, kwargs)
+}
+
+// Get an attribute from the module
+func (m*Module) M__getattribute__(namestring) Object{
+res, ok:=m.Globals[name]
+if!ok{
+panic(ExceptionNewf(AttributeError, "module '%s' has no attribute '%s'", m.Name, name))
+ }
+returnres
+}
+
+func (m*Module) M__setattr__(namestring, valueObject) Object{
+m.Globals[name] =value
+returnNone
+}
+
+// Interfaces
+var_I__getattribute__= (*Module)(nil)
+var_I__setattr__= (*Module)(nil)