Merge ecb4f03 into 5bede68

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - "2.7"
   - "3.4"
+  - "pypy"
 before_install:
   # We need GraphViz
   - "sudo apt-get install graphviz 2>&1 | tail -n 2"
@@ -13,4 +14,4 @@ install:
 script:
   - nosetests --with-coverage --cover-package=pygraphviz
 after_success:
-  - coveralls
+  - coveralls

pygraphviz/agraph.py

@@ -956,6 +956,9 @@ def clear(self):
         directed = self.directed
         gv.agclose(self.handle)
         self.handle = gv.agraphnew(name, strict, directed)
+        self.graph_attr.handle = self.handle
+        self.node_attr.handle = self.handle
+        self.edge_attr.handle = self.handle
 
     def close(self):
         # may be useful to clean up graphviz data
@@ -1201,7 +1204,7 @@ def read(self, path):
                 self.handle = gv.agread(fh, None)
             except ValueError:
                 raise DotError
-            
+
         except IOError:
             print("IO error reading file")
 
@@ -1221,7 +1224,9 @@ def write(self, path=None):
             gv.agwrite(self.handle, fh)
         except IOError:
             print("IO error writing file")
-
+        finally:
+            if hasattr(fh, 'close') and not hasattr(path, 'write'):
+                fh.close()
 
     def string_nop(self):
         """Return a string (unicode) representation of graph in dot format."""

pygraphviz/graphviz.i

@@ -18,15 +18,28 @@ extern PyTypeObject PyIOBase_Type;
 %}
 
 %typemap(in) FILE* (int fd, PyObject *mode_obj, PyObject *mode_byte_obj, char *mode) {
-%#if PY_VERSION_HEX >= 0x03000000
+%#if PY_VERSION_HEX >= 0x03000000 || defined(PYPY_VERSION)
+%#if !defined(PYPY_VERSION)
     if (!PyObject_IsInstance($input, (PyObject *)&PyIOBase_Type)) {
         PyErr_SetString(PyExc_TypeError, "not a file handle");
         return NULL;
     }
     // work around to get hold of FILE*
     fd = PyObject_AsFileDescriptor($input);
+%#else
+    fd = PyObject_AsFileDescriptor($input);
+    if (fd < 0)  {
+        PyErr_SetString(PyExc_TypeError, "not a file handle");
+        return NULL;
+    }
+%#endif
     mode_obj = PyObject_GetAttrString($input, "mode");
-    mode_byte_obj = PyUnicode_AsUTF8String(mode_obj);
+%#if !defined(PYPY_VERSION)
+     mode_byte_obj = PyUnicode_AsUTF8String(mode_obj);
+%#else
+    mode_byte_obj = mode_obj;
+    Py_INCREF(mode_byte_obj);
+%#endif
     mode = PyBytes_AsString(mode_byte_obj);
     $1 = fdopen(fd, mode);
     Py_XDECREF(mode_obj);