Merge branch 'py' of https://github.com/kylef/znc into kylef-py

Conflicts:
	modules/modpython/znc.py

modules/modpython/modpython.i

@@ -123,6 +123,9 @@ public:
 };
 
 %extend CModule {
+	CString __str__() {
+		return $self->GetModName();
+	}
 	MCString_iter BeginNV_() {
 		return MCString_iter($self->BeginNV());
 	}
@@ -146,6 +149,33 @@ public:
 	}
 }
 
+%extend CUser {
+	CString __str__() {
+		return $self->GetUserName();
+	}
+	CString __repr__() {
+		return "<CUser " + $self->GetUserName() + ">";
+	}
+};
+
+%extend CChan {
+	CString __str__() {
+		return $self->GetName();
+	}
+	CString __repr__() {
+		return "<CChan " + $self->GetName() + ">";
+	}
+};
+
+%extend CNick {
+	CString __str__() {
+		return $self->GetNick();
+	}
+	CString __repr__() {
+		return "<CNick " + $self->GetHostMask() + ">";
+	}
+};
+
 /* Web */
 
 %template(StrPair) pair<CString, CString>;