Commit Graph

5693 Commits

Author SHA1 Message Date
Daniel Grunwald 65395a11b1 Merge branch 'python-eval' of https://github.com/murarth/rust-cpython 2015-09-19 16:14:42 +02:00
Daniel Grunwald 93b522404e python27-sys: Add struct definitions for PyCodeObject and PyFrameObject.
Closes #21.
2015-09-19 16:10:15 +02:00
Daniel Grunwald cb938e1906 Start with non-limited python 3 API:
* pymem.h
* object.h
* code.h
* compile.h
* tupleobject.h

The PEP-384 limited API is available when using the "pep-384" cargo feature.
2015-09-19 15:37:29 +02:00
Daniel Grunwald a0cda1a66b python27-sys: compile.h 2015-09-19 13:56:50 +02:00
Daniel Grunwald d87a4596ef Dict tests.
(squashed pull request #31 without PyMapping)
2015-09-18 21:47:10 +02:00
Daniel Grunwald d00d59959a PySequence: change some more return types to PyResult<'p, PyObject<'p>> 2015-09-13 19:37:49 +02:00
Ewan Higgs 65967c2401 Use err::error_on_minusone to clean the code up a bit. 2015-09-08 12:54:38 +02:00
Ewan Higgs dbcdbedc59 Fix up get_item so it returns PyResult (w/o lifetime elision).
Make concat and repeate return PyObject. Also uncomment tests of concat and
repeat.
2015-09-07 23:03:22 +02:00
Ewan Higgs 809e9ab227 Use signed size to allow negative indexing. Add more tests. 2015-09-04 00:52:16 +02:00
Ewan Higgs f90d427454 Tidy up docs, make length and size the same. Test del_item. 2015-08-26 21:45:46 +02:00
Ewan Higgs a63aa43536 Use cast_into instead of from_object. More PySequence tests. 2015-08-26 21:13:13 +02:00
Ewan Higgs 636cfee28d Add tests for sequence. Make list and tuple use private PyObject again.
Add from_object that converts from PyObject into PyList and PyTuple.
Maybe it should be a macro as part of the newtype thing?
2015-08-26 21:13:13 +02:00
Ewan Higgs ff69760b99 Make ctors public for various object types. 2015-08-26 21:13:13 +02:00
Daniel Grunwald 160b23eff0 Remove unnecessary PyList -> PyObject -> PyList roundtrip 2015-08-26 20:19:58 +02:00
Ewan Higgs 173a6147f4 Add tests for list.rs. Still missing tests for extract. 2015-08-26 15:49:43 +02:00
Daniel Grunwald 86a3d605e1 rust-cpython 0.0.4 2015-08-25 20:02:50 +02:00
Daniel Grunwald 3e2dca717e Fix compiler warning (unused std::fs) 2015-08-21 21:28:13 +02:00
Daniel Grunwald fa5c866cd6 Fix compiler error
Closes #27
2015-08-21 21:27:11 +02:00
Daniel Grunwald 6316ddc28b Fix some build errors 2015-08-20 21:14:47 +02:00
Daniel Grunwald 814a2ac720 Merge pull request #28 from novocaine/master
Remove pkgconfig approach from -sys builds.
2015-08-16 15:42:19 +02:00
James Salter 93645484ed Remove pkgconfig approach from -sys builds.
* pkgconfig is frequently broken or missing, doesn't
contain the explicit path to the interpreter (leading
to bad guesses), and confuses users. Rely on PATH alone.

* Fix bad detection of OSX shared library python

* Fix get_config_from_interpreter reporting python interpreter
path inconsistently with find_interpreter_and_get_config -
fixes OSX python.org python 3, which doesn't have a 'python'
in exec_prefix, just 'python3'
2015-08-16 12:30:57 +01:00
Daniel Grunwald a23b5b5910 Add parameter extraction support to `py_fn!` and `py_method!`.
These macros now support specifying an argument list:
`py_fn!(myfn(myarg: i32))`
will expect `myfn` to be a function with the signature:
`fn myfn<'p>(py: Python<'p>, myarg: i32) -> PyResult<'p, _>`

It can called from python as `myfn(1)`
or using keyword arguments: `myfn(myarg=1)`.

If no parameter list is specified (`py_fn!(myfn)`), the expected signature
now includes the keyword arguments:
`fn run<'p>(py: Python<'p>, args: &PyTuple<'p>, kwargs: Option<&PyDict<'p>>)`

Due to the additional `kwargs` argument, this is a [breaking-change].
2015-08-03 00:06:15 +02:00
Murarth 376ce21f2d Implement `eval` and `run` to execute Python code 2015-08-02 14:30:14 -07:00
Daniel Grunwald 072f4d24eb Initial version of `argparse!` 2015-08-02 21:56:03 +02:00
Murarth 74cdb841c6 Fix function and method name fields 2015-08-02 09:32:52 -07:00
Daniel Grunwald 5d16c62cd5 Switch to my interpolate_idents fork until a fix is released 2015-08-02 17:29:04 +02:00
Daniel Grunwald 85b5de71f2 Merge pull request #22 from gentoo90/call-example
Add an example of calling a python function from rust
2015-08-02 16:35:11 +02:00
gentoo90 a785ba87a9 Add an example of calling a python function from rust 2015-07-27 21:56:59 +03:00
Daniel Grunwald a884ee945c Change PyDict::items() to return `Vec<(PyObject, PyObject)>` instead of `PyList`.
This makes it possible iterate through a PyDict in Rust without
having to unpack tuples.

The PyList version of the method is renamed to `items_list()`.

[breaking-change]
2015-07-23 22:21:11 +02:00
Daniel Grunwald 63d5f2cd1a Rename PyErr::new() to PyErr::from_instance() and add use the name PyErr::new() for a more useful function.
Allows simplifying the common
`PyErr::new_lazy_init(py.get_type::<exc::ValueError>(), Some(msg.to_py_object(py).into_object()));`
to
`PyErr:🆕:<exc::ValueError, _>(py, msg)`

[breaking-change]
2015-07-23 22:21:11 +02:00
Daniel Grunwald 45d03bf8bb Replace FromPyObject with the more powerful ExtractPyObject.
This is a [breaking-change] and makes the trait more difficult to implement.
The usage through PyObject::extract() is unchanged.

This change allows extracting a `&str` through a temporary `Cow<str>`
without having to copy the string data from python to rust
(at least in cases where the python string is UTF-8 encoded).

This is preparation in hope I'll be able to make py_fn!()
automatically extract the function arguments.
2015-07-23 22:09:20 +02:00
Daniel Grunwald 1ad27b977e Merge pull request #20 from traff/master
Implement ToPyObject for HashMap->dict conversion.
2015-07-18 17:51:08 +02:00
Daniel Grunwald aac888b1b1 Fix python 2.7 build 2015-07-18 13:44:39 +02:00
Daniel Grunwald 1c4d71d712 Implement ToPyObject for all PythonObjects. 2015-07-18 13:40:26 +02:00
Daniel Grunwald a469635eca python27-sys: add missing object types 2015-07-18 13:40:26 +02:00
Dmitry Trofimov 2cfe522157 -Remove unsafe code;
-Panic if can't add item to dict;
-Test added;
2015-07-17 23:47:30 +02:00
Dmitry Trofimov 144d14f8c4 Implement ToPyObject for HashMap->dict conversion. 2015-07-17 22:07:37 +02:00
Daniel Grunwald f6718a271b Merge pull request #18 from traff/master
A method for accessing dictionary items.
2015-07-13 20:30:08 +02:00
Dmitry Trofimov d495eaaa4a Use err::cast_from_owned_ptr_or_panic, because PyDict_Items creates a new reference to list and can fail. 2015-07-09 00:51:12 +02:00
Daniel Grunwald dd93257bd7 rust-cpython 0.0.3 2015-07-08 22:55:24 +02:00
Daniel Grunwald 04ea39d26f Adjust to breaking change rust-lang/rust#26728 2015-07-08 22:47:56 +02:00
Dmitry Trofimov 79abfb99e8 A method for accessing dictionary items. 2015-07-08 01:26:50 +02:00
Daniel Grunwald a0d8670268 rust-cpython 0.0.2 2015-07-04 20:28:40 +02:00
Daniel Grunwald 29693eec12 python27-sys 0.1.0 and python3-sys 0.1.1 2015-07-04 20:20:06 +02:00
Daniel Grunwald dae7c891dc #16: Try "python" first and only try "pythonX" or "pythonX.Y" if the previous
tries result in the wrong python version.
2015-07-04 18:46:37 +02:00
Daniel Grunwald 43552a075d Enable python 3 CI 2015-06-28 21:46:24 +02:00
Daniel Grunwald 2904330b1c Improve build.rs when configuring using the python in PATH
* First try "pythonX.Y" and
  "pythonX" before using the generic "python"
* Use LDVERSION to detect 'dmu' suffix (PEP-3149)
2015-06-28 21:45:53 +02:00
Daniel Grunwald cdca6f04e8 Fix python 3 build on windows. 2015-06-28 21:45:53 +02:00
Daniel Grunwald 76e38e1a54 Add python 3 support to PyRustTypeBuilder. 2015-06-28 04:12:51 +02:00
Daniel Grunwald 00492e700c Make python 3 the default.
Today is the day :)
2015-06-27 23:50:50 +02:00