aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-26 01:23:59 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-26 01:23:59 +0200
commitb13acd7956f2e09bf5f9001f8f55d018a381f6c2 (patch)
tree0cb1a99bcd453c435886a0bfd516520e1cd13612 /docs
parenta978c6b9cee134d01f84216f3fbcf1ae9303d965 (diff)
downloadmitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.tar.gz
mitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.tar.bz2
mitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.zip
adjust to netlib request changes + docs
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile2
-rw-r--r--docs/conf.py3
-rw-r--r--docs/dev/models.rst47
3 files changed, 43 insertions, 9 deletions
diff --git a/docs/Makefile b/docs/Makefile
index a22bc8a2..99264d90 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -192,4 +192,4 @@ pseudoxml:
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
livehtml:
- sphinx-autobuild -b html -z '../libmproxy' -r '___jb_(old|bak)___$$' $(ALLSPHINXOPTS) $(BUILDDIR)/html \ No newline at end of file
+ sphinx-autobuild -b html -z '../libmproxy' -z '../../netlib/netlib' -r '___jb_(old|bak)___$$' $(ALLSPHINXOPTS) $(BUILDDIR)/html \ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 1e686007..ff4a4a86 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,6 +40,9 @@ extensions = [
'sphinxcontrib.documentedlist'
]
+# https://github.com/sphinx-doc/sphinx/pull/2053
+napoleon_include_special_with_doc = False
+
autodoc_member_order = "bysource"
# Add any paths that contain templates here, relative to this directory.
diff --git a/docs/dev/models.rst b/docs/dev/models.rst
index 9929e4b2..617bcb1f 100644
--- a/docs/dev/models.rst
+++ b/docs/dev/models.rst
@@ -8,18 +8,49 @@ Models
are missing**.
Please read the source code instead.
-.. automodule:: libmproxy.models
- :show-inheritance:
- :members:
- :undoc-members:
+.. automodule:: netlib.http
+
+ .. autoclass:: Request
+
+ .. rubric:: Data
+ .. autoattribute:: first_line_format
+ .. autoattribute:: method
+ .. autoattribute:: scheme
+ .. autoattribute:: host
+ .. autoattribute:: port
+ .. autoattribute:: path
+ .. autoattribute:: http_version
+ .. autoattribute:: headers
+ .. autoattribute:: content
+ .. autoattribute:: timestamp_start
+ .. autoattribute:: timestamp_end
+ .. rubric:: Computed Properties and Convenience Methods
+ .. autoattribute:: text
+ .. autoattribute:: url
+ .. autoattribute:: pretty_host
+ .. autoattribute:: pretty_url
+ .. autoattribute:: query
+ .. autoattribute:: cookies
+ .. autoattribute:: path_components
+ .. automethod:: anticache
+ .. automethod:: anticomp
+ .. automethod:: constrain_encoding
+ .. autoattribute:: urlencoded_form
+ .. autoattribute:: multipart_form
+
+ .. autoclass:: Response
+ .. warning:: Docs missing.
-.. automodule:: netlib.http.semantics
- :members: Request, Response
- :undoc-members:
.. autoclass:: Headers
- :show-inheritance:
:members:
:special-members:
:no-undoc-members:
+
+
+ .. autoclass:: decoded
+
+.. automodule:: libmproxy.models
+ :show-inheritance:
+ :members: HTTPFlow, Error, ClientConnection, ServerConnection \ No newline at end of file