qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kgiu...@apache.org
Subject qpid-proton git commit: NO-JIRA: fix documentation build
Date Mon, 09 Mar 2015 17:39:30 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 97ca1441a -> bc2b630eb


NO-JIRA: fix documentation build


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/bc2b630e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/bc2b630e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/bc2b630e

Branch: refs/heads/master
Commit: bc2b630eb969710b04a861797567ab2dc368020a
Parents: 97ca144
Author: Ken Giusti <kgiusti@apache.org>
Authored: Mon Mar 9 13:38:56 2015 -0400
Committer: Ken Giusti <kgiusti@apache.org>
Committed: Mon Mar 9 13:38:56 2015 -0400

----------------------------------------------------------------------
 proton-c/bindings/python/CMakeLists.txt     | 5 ++++-
 proton-c/bindings/python/proton/__init__.py | 2 +-
 proton-c/bindings/python/proton/utils.py    | 7 +++----
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc2b630e/proton-c/bindings/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
index 7f54033..2886326 100644
--- a/proton-c/bindings/python/CMakeLists.txt
+++ b/proton-c/bindings/python/CMakeLists.txt
@@ -80,10 +80,13 @@ py_compile(${CMAKE_CURRENT_SOURCE_DIR} "${pysrc}" PROTON_ARTIFACTS)
 find_program(EPYDOC_EXE epydoc)
 mark_as_advanced (EPYDOC_EXE)
 if (EPYDOC_EXE)
+   foreach (py_src_doc ${pysrc})
+     list(APPEND PY_DOC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${py_src_doc}")
+   endforeach(py_src_doc)
    add_custom_target(docs-py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../../env.py
--
      PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
      ${EPYDOC_EXE} -v --no-private --html -o ${CMAKE_CURRENT_BINARY_DIR}/html
-     ${CMAKE_CURRENT_SOURCE_DIR}/${pysrc})
+     ${PY_DOC_FILES})
    add_dependencies(docs docs-py)
    install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
            DESTINATION "${PROTON_SHARE}/docs/api-py"

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc2b630e/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index c200e9c..d69d3dc 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -3778,7 +3778,7 @@ class Url(object):
   """
   Simple URL parser/constructor, handles URLs of the form:
 
-    <scheme>://<user>:<password>@<host>:<port>/<path>
+  <scheme>://<user>:<password>@<host>:<port>/<path>
 
   All components can be None if not specifeid in the URL string.
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc2b630e/proton-c/bindings/python/proton/utils.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/utils.py b/proton-c/bindings/python/proton/utils.py
index fabe887..b5ecdf7 100644
--- a/proton-c/bindings/python/proton/utils.py
+++ b/proton-c/bindings/python/proton/utils.py
@@ -277,6 +277,8 @@ class AtomicCount(object):
 class SyncRequestResponse(IncomingMessageHandler):
     """
     Implementation of the synchronous request-responce (aka RPC) pattern.
+    @ivar address: Address for all requests, may be None.
+    @ivar connection: Connection for requests and responses.
     """
 
     correlation_id = AtomicCount()
@@ -290,9 +292,6 @@ class SyncRequestResponse(IncomingMessageHandler):
         @param address: Address for all requests.
             If not specified, each request must have the address property set.
             Sucessive messages may have different addresses.
-
-        @ivar address: Address for all requests, may be None.
-        @ivar connection: Connection for requests and responses.
         """
         super(SyncRequestResponse, self).__init__()
         self.connection = connection
@@ -308,7 +307,7 @@ class SyncRequestResponse(IncomingMessageHandler):
         Send a request message, wait for and return the response message.
 
         @param request: A L{proton.Message}. If L{self.address} is not set the 
-            L{request.address} must be set and will be used.
+            L{self.address} must be set and will be used.
         """
         if not self.address and not request.address:
             raise ValueError("Request message has no address: %s" % request)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message