diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 19:53:03 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 19:53:03 +0200 |
| commit | 9b6248fc6d3be0e3970e19138bedd0655e4565e8 (patch) | |
| tree | ee2852ba33f5638d9d3973c944ccc604b5e6fb99 /src/python/grpcio | |
| parent | b457cd831ad519d5ec023005ba6ccfb52ff4c9cb (diff) | |
| parent | 3b226512d4aa84d58e1e61ce3f9adb9315f2d619 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
src/node/ext/call.cc
src/node/ext/channel.cc
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc/_adapter/_c/types/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc/_adapter/_c/types/server.c b/src/python/grpcio/grpc/_adapter/_c/types/server.c index 2401f2faf0..15c98f28eb 100644 --- a/src/python/grpcio/grpc/_adapter/_c/types/server.c +++ b/src/python/grpcio/grpc/_adapter/_c/types/server.c @@ -96,7 +96,7 @@ Server *pygrpc_Server_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject *py_args; grpc_channel_args c_args; char *keywords[] = {"cq", "args", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O:Channel", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O:Server", keywords, &pygrpc_CompletionQueue_type, &cq, &py_args)) { return NULL; } |