Merge branch 'master' of https://github.com/danic/pythonnet

Dani Carles · Dani Carles · commit 2facdf32773f · 2016-03-14T09:01:51.000Z
diff --git a/src/monoclr/pynetinit.c b/src/monoclr/pynetinit.c
@@ -47,14 +47,14 @@ PyNet_Args* PyNet_Init(int ext) {
      * mono_runtime_exec_managed_code(pn_args->domain, main_thread_handler,
      *                                pn_args);
      */
-                                   
+
     main_thread_handler(pn_args);
 
     if (pn_args->error != NULL) {
         PyErr_SetString(PyExc_ImportError, pn_args->error);
     }
     return pn_args;
-} 
+}
 
 // Shuts down PythonNet and cleans up Mono
 void PyNet_Finalize(PyNet_Args *pn_args) {
@@ -67,7 +67,7 @@ void PyNet_Finalize(PyNet_Args *pn_args) {
         }
         pn_args->shutdown = NULL;
     }
-    
+
     if (pn_args->domain) {
         mono_jit_cleanup(pn_args->domain);
         pn_args->domain = NULL;
@@ -178,7 +178,7 @@ void main_thread_handler (gpointer user_data) {
     }
 }
 
-// Get string from a Mono exception 
+// Get string from a Mono exception
 char* PyNet_ExceptionToString(MonoObject *e) {
     MonoMethodDesc* mdesc = mono_method_desc_new(":ToString()", FALSE);
     MonoMethod* mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());
@@ -189,4 +189,3 @@ char* PyNet_ExceptionToString(MonoObject *e) {
     mono_runtime_invoke(mmethod, e, NULL, NULL);
     return mono_string_to_utf8(monoString);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@ PyNet_Args* PyNet_Init(int ext) {`
`47`	`47`	`* mono_runtime_exec_managed_code(pn_args->domain, main_thread_handler,`
`48`	`48`	`* pn_args);`
`49`	`49`	`*/`
`50`		`-`
	`50`	`+`
`51`	`51`	`main_thread_handler(pn_args);`
`52`	`52`
`53`	`53`	`if (pn_args->error != NULL) {`
`54`	`54`	`PyErr_SetString(PyExc_ImportError, pn_args->error);`
`55`	`55`	`}`
`56`	`56`	`return pn_args;`
`57`		`-}`
	`57`	`+}`
`58`	`58`
`59`	`59`	`// Shuts down PythonNet and cleans up Mono`
`60`	`60`	`void PyNet_Finalize(PyNet_Args *pn_args) {`
`@@ -67,7 +67,7 @@ void PyNet_Finalize(PyNet_Args *pn_args) {`
`67`	`67`	`}`
`68`	`68`	`pn_args->shutdown = NULL;`
`69`	`69`	`}`
`70`		`-`
	`70`	`+`
`71`	`71`	`if (pn_args->domain) {`
`72`	`72`	`mono_jit_cleanup(pn_args->domain);`
`73`	`73`	`pn_args->domain = NULL;`
`@@ -178,7 +178,7 @@ void main_thread_handler (gpointer user_data) {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`-// Get string from a Mono exception`
	`181`	`+// Get string from a Mono exception`
`182`	`182`	`char* PyNet_ExceptionToString(MonoObject *e) {`
`183`	`183`	`MonoMethodDesc* mdesc = mono_method_desc_new(":ToString()", FALSE);`
`184`	`184`	`MonoMethod* mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());`
`@@ -189,4 +189,3 @@ char* PyNet_ExceptionToString(MonoObject *e) {`
`189`	`189`	`mono_runtime_invoke(mmethod, e, NULL, NULL);`
`190`	`190`	`return mono_string_to_utf8(monoString);`
`191`	`191`	`}`
`192`		`-`