fixes memory management, strips pseudoscope prefix from enums

Author: Sam Hatchett

owa-epanet/EPANET

@@ -9,7 +9,6 @@ _skbuild \
 _cmake_test_compile \
 dist \
 packages/epanet.egg-info \
-test/*
+test/Pipf*
 
 touch test/Pipfile
-

owa-epanet/scripts/clean.sh

@@ -6,7 +6,7 @@
 
 setup(
     name = "owa-epanet",
-    version = "1.0.2",
+    version = "1.0.3",
     author = "Sam Hatchett",
     author_email = "samhatchett@gmail.com",
     description = "a thin wrapper for epanet hydraulic toolkit",

owa-epanet/setup.py

@@ -0,0 +1,8 @@
+from epanet import toolkit
+
+for i in range(1,4):
+    p = toolkit.createproject()
+    toolkit.deleteproject(p)
+
+p = toolkit.createproject()
+del p

owa-epanet/test/test-lib.py

@@ -6,9 +6,8 @@
 %{
 #include <epanet2_2.h>
 %}
-%include <epanet2_enums.h>
 
-/* strip the pseudo-scope from function declarations */
+/* strip the pseudo-scope from function declarations and enums*/
 %rename("%(strip:[EN_])s") "";
 
 %typemap(in,numinputs=0) EN_Project* (EN_Project temp) {
@@ -25,16 +24,6 @@
     Py_INCREF($result);
 }
 
-%delobject deleteproject;
-
-struct Project {};
-%extend Project {
-  ~Project() {
-    EN_deleteproject($self);
-  }
-};
-%ignore Project;
-
 %apply int *OUTPUT {
     int *count,
     int *version,
@@ -105,6 +94,14 @@ struct Project {};
     int *inout_index
 }
 
+%nodefault Project;
+struct Project {};
+%extend Project {
+  ~Project() {
+    EN_deleteproject($self);
+  }
+};
+ignore Project;
 
 /* INSERTS CUSTOM EXCEPTION HANDLING IN WRAPPER */
 %exception
@@ -120,6 +117,8 @@ struct Project {};
 }
 
 %feature("autodoc", "2");
+%newobject EN_createproject;
+%delobject EN_deleteproject;
+%include <epanet2_enums.h>
 %include <epanet2_2.h>
-
 %exception;