summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/index.rst2
-rw-r--r--docs/reference/kombu.transport.pyamqp.rst36
-rw-r--r--docs/reference/kombu.transport.zmq.rst9
-rw-r--r--docs/userguide/serialization.rst4
4 files changed, 51 insertions, 0 deletions
diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 551ea1b7..c6186341 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -22,10 +22,12 @@
kombu.transport
kombu.transport.amqplib
kombu.transport.librabbitmq
+ kombu.transport.pyamqp
kombu.transport.pika
kombu.transport.pika2
kombu.transport.memory
kombu.transport.redis
+ kombu.transport.zmq
kombu.transport.beanstalk
kombu.transport.mongodb
kombu.transport.couchdb
diff --git a/docs/reference/kombu.transport.pyamqp.rst b/docs/reference/kombu.transport.pyamqp.rst
new file mode 100644
index 00000000..33ebf0b4
--- /dev/null
+++ b/docs/reference/kombu.transport.pyamqp.rst
@@ -0,0 +1,36 @@
+.. currentmodule:: kombu.transport.pyamqp
+
+.. automodule:: kombu.transport.pyamqp
+
+ .. contents::
+ :local:
+
+ Transport
+ ---------
+
+ .. autoclass:: Transport
+ :members:
+ :undoc-members:
+
+ Connection
+ ----------
+
+ .. autoclass:: Connection
+ :members:
+ :undoc-members:
+ :inherited-members:
+
+ Channel
+ -------
+
+ .. autoclass:: Channel
+ :members:
+ :undoc-members:
+
+ Message
+ -------
+
+ .. autoclass:: Message
+ :members:
+ :undoc-members:
+
diff --git a/docs/reference/kombu.transport.zmq.rst b/docs/reference/kombu.transport.zmq.rst
new file mode 100644
index 00000000..0735840b
--- /dev/null
+++ b/docs/reference/kombu.transport.zmq.rst
@@ -0,0 +1,9 @@
+.. currentmodule:: kombu.transport.zmq
+
+.. automodule:: kombu.transport.zmq
+
+ .. contents::
+ :local:
+
+ :members:
+ :undoc-members:
diff --git a/docs/userguide/serialization.rst b/docs/userguide/serialization.rst
index c39cc3cc..d07c98a5 100644
--- a/docs/userguide/serialization.rst
+++ b/docs/userguide/serialization.rst
@@ -44,6 +44,10 @@ Each option has its advantages and disadvantages.
smaller messages when sending binary files, and a slight speedup
over `JSON` processing.
+ By default Kombu uses pickle protocol 2, but this can be changed
+ using the :envvar:`PICKLE_PROTOCOL` environment variable or by changing
+ the global :data:`kombu.serialization.pickle_protocol` flag.
+
`yaml` -- YAML has many of the same characteristics as `json`,
except that it natively supports more data types (including dates,
recursive references, etc.)