Fix #10: Windows support.

We keep the #[link] attributes in #[cfg_attr(windows)] so that we don't require a nightly Rust build on non-Windows platforms.
This can be simplified once RFC 1717 is available in a stable rust version.

This commit also increases the minimum Rust version to 1.13.

.travis.yml

@@ -5,7 +5,7 @@ python:
   - "3.4"
   - "3.5"
 env:
-  - RUST_VERSION=1.7.0
+  - RUST_VERSION=1.13.0
   - RUST_VERSION=nightly
 sudo: false
 install:

README.md

@@ -19,7 +19,8 @@ Supported Python versions:
 * Python 3.5
 
 Supported Rust version:
-* Rust 1.7.0 or later
+* Rust 1.13.0 or later
+* On Windows, we require rustc 1.15.0-nightly
 
 # Usage
 
@@ -35,21 +36,23 @@ Example program displaying the value of `sys.version`:
 ```rust
 extern crate cpython;
 
-use cpython::Python;
-use cpython::ObjectProtocol; //for call method
+use cpython::{Python, PyDict, PyResult};
 
 fn main() {
     let gil = Python::acquire_gil();
-    let py = gil.python();
+    hello(gil.python()).unwrap();
+}
 
-    let sys = py.import("sys").unwrap();
-    let version: String = sys.get(py, "version").unwrap().extract(py).unwrap();
+fn hello(py: Python) -> PyResult<()> {
+    let sys = py.import("sys")?;
+    let version: String = sys.get(py, "version")?.extract(py)?;
 
-    let os = py.import("os").unwrap();
-    let getenv = os.get(py, "getenv").unwrap();
-    let user: String = getenv.call(py, ("USER",), None).unwrap().extract(py).unwrap();
+    let locals = PyDict::new(py);
+    locals.set_item(py, "os", py.import("os")?)?;
+    let user: String = py.eval("os.getenv('USER') or os.getenv('USERNAME')", None, Some(&locals))?.extract(py)?;
 
     println!("Hello {}, I'm Python {}", user, version);
+    Ok(())
 }
 ```
 

appveyor.yml

@@ -22,6 +22,6 @@ install:
 build_script:
  - set PATH=C:\Python27-x64;%PATH%&& cargo build --verbose --features python27-sys --no-default-features
  - set PATH=C:\Python34-x64;%PATH%&& cargo build --verbose --features python3-sys --no-default-features
-test: false
-#test_script:
-# - cargo test --verbose
+test_script:
+ - set PATH=C:\Python27-x64;%PATH%&& cargo test --verbose --features python27-sys --no-default-features
+ - set PATH=C:\Python34-x64;%PATH%&& cargo test --verbose --features python3-sys --no-default-features

examples/hello.rs

@@ -1,18 +1,20 @@
 extern crate cpython;
 
-use cpython::Python;
-use cpython::ObjectProtocol; //for call method
+use cpython::{Python, PyDict, PyResult};
 
 fn main() {
     let gil = Python::acquire_gil();
-    let py = gil.python();
+    hello(gil.python()).unwrap();
+}
 
-    let sys = py.import("sys").unwrap();
-    let version: String = sys.get(py, "version").unwrap().extract(py).unwrap();
+fn hello(py: Python) -> PyResult<()> {
+    let sys = py.import("sys")?;
+    let version: String = sys.get(py, "version")?.extract(py)?;
 
-    let os = py.import("os").unwrap();
-    let getenv = os.get(py, "getenv").unwrap();
-    let user: String = getenv.call(py, ("USER",), None).unwrap().extract(py).unwrap();
+    let locals = PyDict::new(py);
+    locals.set_item(py, "os", py.import("os")?)?;
+    let user: String = py.eval("os.getenv('USER') or os.getenv('USERNAME')", None, Some(&locals))?.extract(py)?;
 
     println!("Hello {}, I'm Python {}", user, version);
+    Ok(())
 }

python27-sys/build.rs

@@ -226,7 +226,7 @@ fn get_interpreter_version(line: &str) -> Result<PythonVersion, String> {
 #[cfg(target_os="windows")]
 fn get_rustc_link_lib(version: &PythonVersion, _: bool) -> Result<String, String> {
     // Py_ENABLE_SHARED doesn't seem to be present on windows.
-    Ok(format!("cargo:rustc-link-lib=python{}{}", version.major, 
+    Ok(format!("cargo:rustc-link-lib=pythonXY:python{}{}", version.major, 
         match version.minor {
             Some(minor) => minor.to_string(),
             None => "".to_owned()

python27-sys/src/boolobject.rs

@@ -4,8 +4,7 @@ use intobject::PyIntObject;
 
 pub type PyBoolObject = PyIntObject;
 
-
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyBool_Type: PyTypeObject;
     static mut _Py_ZeroStruct: PyIntObject;
     static mut _Py_TrueStruct: PyIntObject;

python27-sys/src/bufferobject.rs

@@ -2,7 +2,7 @@ use libc::{c_void, c_int};
 use object::*;
 use pyport::Py_ssize_t;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyBuffer_Type: PyTypeObject;
 }
 
@@ -14,7 +14,7 @@ pub unsafe fn PyBuffer_Check(op : *mut PyObject) -> c_int {
 
 pub const Py_END_OF_BUFFER: Py_ssize_t = -1;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyBuffer_FromObject(base: *mut PyObject, offset: Py_ssize_t,
                                size: Py_ssize_t) -> *mut PyObject;
     pub fn PyBuffer_FromReadWriteObject(base: *mut PyObject,

python27-sys/src/bytearrayobject.rs

@@ -17,7 +17,7 @@ struct PyByteArrayObject {
     pub ob_bytes: *mut c_char,
 }*/
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyByteArray_Type: PyTypeObject;
     pub static mut PyByteArrayIter_Type: PyTypeObject;
 }
@@ -31,7 +31,7 @@ pub unsafe fn PyByteArray_CheckExact(op : *mut PyObject) -> c_int {
     (Py_TYPE(op) == u) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyByteArray_FromObject(o: *mut PyObject) -> *mut PyObject;
     pub fn PyByteArray_Concat(a: *mut PyObject, b: *mut PyObject)
      -> *mut PyObject;

python27-sys/src/cellobject.rs

@@ -14,7 +14,7 @@ struct PyCellObject {
     pub ob_ref: *mut PyObject
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyCell_Type: PyTypeObject;
 }
 
@@ -23,7 +23,7 @@ pub unsafe fn PyCell_Check(op: *mut PyObject) -> c_int {
      (Py_TYPE(op) == &mut PyCell_Type) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyCell_New(obj: *mut PyObject) -> *mut PyObject;
     pub fn PyCell_Get(op: *mut PyObject) -> *mut PyObject;
     pub fn PyCell_Set(op: *mut PyObject, obj: *mut PyObject) -> c_int;

python27-sys/src/ceval.rs

@@ -5,7 +5,7 @@ use frameobject::PyFrameObject;
 use pystate::{PyThreadState, Py_tracefunc};
 use pythonrun::PyCompilerFlags;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_CallObjectWithKeywords(callable: *mut PyObject,
                                          args: *mut PyObject,
                                          kwds: *mut PyObject)
@@ -53,7 +53,7 @@ extern "C" {
 }
 
 #[cfg(py_sys_config="WITH_THREAD")]
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_ThreadsInitialized() -> c_int;
     pub fn PyEval_InitThreads();
     pub fn PyEval_AcquireLock();

python27-sys/src/classobject.rs

@@ -49,7 +49,7 @@ pub struct PyMethodObject {
     pub im_weakreflist: *mut PyObject,
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyClass_Type: PyTypeObject;
     pub static mut PyInstance_Type: PyTypeObject;
     pub static mut PyMethod_Type: PyTypeObject;
@@ -73,7 +73,7 @@ pub unsafe fn PyMethod_Check(op : *mut PyObject) -> c_int {
     (Py_TYPE(op) == u) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyClass_New(arg1: *mut PyObject, arg2: *mut PyObject,
                        arg3: *mut PyObject) -> *mut PyObject;
     pub fn PyInstance_New(arg1: *mut PyObject, arg2: *mut PyObject,

python27-sys/src/cobject.rs

@@ -1,7 +1,7 @@
 use libc::{c_void, c_char, c_int};
 use object::*;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyCObject_Type: PyTypeObject;
 }
 
@@ -10,7 +10,7 @@ pub unsafe fn PyCObject_Check(op : *mut PyObject) -> c_int {
     (Py_TYPE(op) == &mut PyCObject_Type) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyCObject_FromVoidPtr(cobj: *mut c_void,
                                  destruct:
                                      Option<unsafe extern "C" fn

python27-sys/src/code.rs

@@ -51,7 +51,7 @@ pub const CO_FUTURE_UNICODE_LITERALS : c_int = 0x20000;
 
 pub const CO_MAXBLOCKS : usize = 20;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyCode_Type: PyTypeObject;
 
     pub fn PyCode_New(arg1: c_int, arg2: c_int,

python27-sys/src/compile.rs

@@ -18,7 +18,7 @@ pub const FUTURE_WITH_STATEMENT   : &'static str = "with_statement";
 pub const FUTURE_PRINT_FUNCTION   : &'static str = "print_function";
 pub const FUTURE_UNICODE_LITERALS : &'static str = "unicode_literals";
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyNode_Compile(arg1: *mut Struct__node,
                           arg2: *const c_char) -> *mut PyCodeObject;
     pub fn PyAST_Compile(arg1: *mut Struct__mod, arg2: *const c_char,

python27-sys/src/complexobject.rs

@@ -9,7 +9,7 @@ pub struct Py_complex {
     pub imag: c_double
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn _Py_c_sum(left: Py_complex, right: Py_complex) -> Py_complex;
     pub fn _Py_c_diff(left: Py_complex, right: Py_complex) -> Py_complex;
     pub fn _Py_c_neg(complex: Py_complex) -> Py_complex;
@@ -31,7 +31,7 @@ pub struct PyComplexObject {
     pub cval: Py_complex
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyComplex_Type: PyTypeObject;
 }
 
@@ -46,7 +46,7 @@ pub unsafe fn PyComplex_CheckExact(op : *mut PyObject) -> c_int {
     (Py_TYPE(op) == u) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyComplex_FromCComplex(v: Py_complex) -> *mut PyObject;
     pub fn PyComplex_FromDoubles(real: c_double,
                                  imag: c_double) -> *mut PyObject;

python27-sys/src/descrobject.rs

@@ -53,7 +53,7 @@ impl Clone for wrapperbase {
 
 pub const PyWrapperFlag_KEYWORDS : c_int = 1;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyWrapperDescr_Type: PyTypeObject;
     pub static mut PyDictProxy_Type: PyTypeObject;
     pub static mut PyGetSetDescr_Type: PyTypeObject;
@@ -78,7 +78,7 @@ pub unsafe fn PyDescr_IsData(d: *mut PyObject) -> c_int {
     (*Py_TYPE(d)).tp_descr_set.is_some() as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     //pub fn PyDictProxy_New(arg1: *mut PyObject) -> *mut PyObject;
     // PyDictProxy_New is also defined in dictobject.h
     pub fn PyWrapper_New(arg1: *mut PyObject, arg2: *mut PyObject)

python27-sys/src/dictobject.rs

@@ -4,7 +4,7 @@ use object::*;
 
 //pub enum PyDictObject { /* representation hidden */ }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyDict_Type: PyTypeObject;
     pub static mut PyDictIterKey_Type: PyTypeObject;
     pub static mut PyDictIterValue_Type: PyTypeObject;
@@ -25,7 +25,7 @@ pub unsafe fn PyDict_CheckExact(op : *mut PyObject) -> c_int {
     (Py_TYPE(op) == u) as c_int
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyDict_New() -> *mut PyObject;
     pub fn PyDictProxy_New(dict: *mut PyObject) -> *mut PyObject;
     pub fn PyDict_Clear(mp: *mut PyObject);

python27-sys/src/enumobject.rs

@@ -1,6 +1,6 @@
 use object::PyTypeObject;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyEnum_Type: PyTypeObject;
     pub static mut PyReversed_Type: PyTypeObject;
 }

python27-sys/src/eval.rs

@@ -2,7 +2,7 @@ use libc::c_int;
 use object::PyObject;
 use code::PyCodeObject;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_EvalCode(arg1: *mut PyCodeObject, arg2: *mut PyObject,
                            arg3: *mut PyObject) -> *mut PyObject;
     pub fn PyEval_EvalCodeEx(co: *mut PyCodeObject, globals: *mut PyObject,

python27-sys/src/fileobject.rs

@@ -1,7 +1,7 @@
 use libc::{c_char, c_int, size_t, FILE};
 use object::*;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyFile_Type: PyTypeObject;
 }
 
@@ -18,7 +18,7 @@ pub unsafe fn PyFile_CheckExact(op : *mut PyObject) -> c_int {
 
 pub const PY_STDIOTEXTMODE : &'static str = "b";
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyFile_FromString(arg1: *mut c_char,
                              arg2: *mut c_char) -> *mut PyObject;
     pub fn PyFile_SetBufSize(arg1: *mut PyObject, arg2: c_int);

python27-sys/src/floatobject.rs

@@ -14,7 +14,7 @@ struct PyFloatObject {
     pub ob_fval: c_double
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyFloat_Type: PyTypeObject;
 }
 
@@ -31,7 +31,7 @@ pub unsafe fn PyFloat_CheckExact(op : *mut PyObject) -> c_int {
 
 pub const PyFloat_STR_PRECISION : c_int = 12;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyFloat_FromString(str: *mut PyObject,
                               pend: *mut *mut c_char)
      -> *mut PyObject;

python27-sys/src/frameobject.rs

@@ -52,7 +52,7 @@ pub struct PyFrameObject {
     pub f_localsplus: [*mut PyObject; 1]	/* locals+stack, dynamically sized */
 }
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyFrame_Type: PyTypeObject;
 }
 
@@ -66,7 +66,7 @@ pub unsafe fn PyFrame_Check(op: *mut PyObject) -> c_int {
 //     ((*f).f_builtins != (*(*(*f).f_tstate).interp).builtins) as c_int
 //}
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyFrame_New(tstate: *mut PyThreadState, code: *mut PyCodeObject,
         globals: *mut PyObject, locals: *mut PyObject) -> *mut PyFrameObject;
 

python27-sys/src/funcobject.rs

@@ -1,7 +1,7 @@
 use libc::c_int;
 use object::*;
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyFunction_Type: PyTypeObject;
 }
 
@@ -12,7 +12,7 @@ pub unsafe fn PyFunction_Check(op : *mut PyObject) -> c_int {
 }
 
 
-extern "C" {
+#[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyFunction_New(code: *mut PyObject, globals: *mut PyObject)
      -> *mut PyObject;
     pub fn PyFunction_GetCode(f: *mut PyObject) -> *mut PyObject;