Make modules have attributes and call methods in them

ncw · ncw · commit c1949ed9c6c9 · 2013-12-04T22:15:04.000Z
diff --git a/py/internal.go b/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
 func GetAttrOrNil(self Object, key string) (res Object) {
+	defer func() {
+		if r := recover(); r != nil {
+			if IsException(AttributeError, r) {
+				// AttributeError caught - return nil
+				res = nil
+			} else {
+				// Propagate the exception
+				panic(r)
+			}
+		}
+	}()
+
 	// Call __getattribute unconditionally if it exists
 	if I, ok := self.(I__getattribute__); ok {
 		res = I.M__getattribute__(key)
diff --git a/py/module.go b/py/module.go
@@ -52,3 +52,26 @@ func NewModule(name, doc string, methods []*Method, globals StringDict) *Module
 	fmt.Printf("Registering module %q\n", name)
 	return m
 }
+
+// Calls a named method of a module
+func (m *Module) Call(name string, args Tuple, kwargs StringDict) Object {
+	return Call(m.M__getattribute__(name), args, kwargs)
+}
+
+// Get an attribute from the module
+func (m *Module) M__getattribute__(name string) Object {
+	res, ok := m.Globals[name]
+	if !ok {
+		panic(ExceptionNewf(AttributeError, "module '%s' has no attribute '%s'", m.Name, name))
+	}
+	return res
+}
+
+func (m *Module) M__setattr__(name string, value Object) Object {
+	m.Globals[name] = value
+	return None
+}
+
+// Interfaces
+var _ I__getattribute__ = (*Module)(nil)
+var _ I__setattr__ = (*Module)(nil)
