Merge branch 'master' of https://github.com/kentdlee/CoCo.git

PyException.h

@@ -57,25 +57,25 @@ using namespace std;
 class PyException: public PyObject {
 public:
 	PyException(int exceptType, PyObject* val);
-        PyException(int exceptType, string message);
+    PyException(int exceptType, string message);
 	virtual ~PyException();
 	int getExceptionType();
-        void tracebackAppend(PyFrame* frame);
+    void tracebackAppend(PyFrame* frame);
 	string toString();
-        PyType* getType();
-        PyObject* getTraceBack();
-        void printTraceBack();
+    PyType* getType();
+    PyObject* getTraceBack();
+    void printTraceBack();
 
 
 protected:
 	/* This is only here for debugging purposes. The exception type should be
 	 * the second field within the object if the first field indicates an exception.
 	 */
 	int exceptionType;
-        PyObject* val;
-        vector<PyFrame*> traceback;
+    PyObject* val;
+    vector<PyFrame*> traceback;
 
-        virtual PyObject* __excmatch__(vector<PyObject*>* args);
+    virtual PyObject* __excmatch__(vector<PyObject*>* args);
 };
 
 const int PYEXCEPTION = 1;

PyObject.cpp

@@ -24,7 +24,7 @@
 #include <sstream>
 using namespace std;
 
-ostream &operator <<(ostream &os, PyObject &t) {
+ostream& operator <<(ostream &os, PyObject &t) {
     return os << t.toString();
 }