fixes to make tests pass on windows

masci · masci · commit cdc22b2a9832 · 2017-01-26T20:05:51.000+01:00
diff --git a/exceptions.go b/exceptions.go
@@ -246,12 +246,6 @@ func PyErr_SetInterrupt() {
 	C.PyErr_SetInterrupt()
 }
 
-// int PySignal_SetWakeupFd(int fd)
-// This utility function specifies a file descriptor to which a '\0' byte will be written whenever a signal is received. It returns the previous such file descriptor. The value -1 disables the feature; this is the initial state. This is equivalent to signal.set_wakeup_fd() in Python, but without any error checking. fd should be a valid file descriptor. The function should only be called from the main thread.
-func PySignal_SetWakeupFd(fd int) int {
-	return int(C.PySignal_SetWakeupFd(C.int(fd)))
-}
-
 // PyObject* PyErr_NewException(char *name, PyObject *base, PyObject *dict)
 // Return value: New reference.
 // This utility function creates and returns a new exception object. The name argument must be the name of the new exception, a C string of the form module.class. The base and dict arguments are normally NULL. This creates a class object derived from Exception (accessible in C as PyExc_Exception).
diff --git a/exceptions_posix.go b/exceptions_posix.go
@@ -0,0 +1,9 @@
+// +build !windows
+
+package python
+
+// int PySignal_SetWakeupFd(int fd)
+// This utility function specifies a file descriptor to which a '\0' byte will be written whenever a signal is received. It returns the previous such file descriptor. The value -1 disables the feature; this is the initial state. This is equivalent to signal.set_wakeup_fd() in Python, but without any error checking. fd should be a valid file descriptor. The function should only be called from the main thread.
+func PySignal_SetWakeupFd(fd int) int {
+	return int(C.PySignal_SetWakeupFd(C.int(fd)))
+}
diff --git a/object_posix.go b/object_posix.go
@@ -1,3 +1,5 @@
+// +build !windows
+
 package python
 
 //#include <stdlib.h>
diff --git a/object_windows.go b/object_windows.go
@@ -15,7 +15,7 @@ import (
 func file2py(f *os.File, mode string) *C.FILE {
 	cmode := C.CString(mode)
 	defer C.free(unsafe.Pointer(cmode))
-	name := C.CString(file.Name())
+	name := C.CString(f.Name())
 	defer C.free(unsafe.Pointer(name))
 	file := C.fopen(name, cmode)
 	return file

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// +build !windows`
	`2`	`+`
`1`	`3`	`package python`
`2`	`4`
`3`	`5`	`//#include <stdlib.h>`