December 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Update reference to module txscapy in ooni documentation
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 9a9b229b8106418ffb8ff41f5b3ea8ad3e7d713a Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:15:30 2012 +0000 Update reference to module txscapy in ooni documentation * txscapy was moved to ooni/utils from ooni/lib --- docs/source/api/ooni.lib.rst | 8 -------- docs/source/api/ooni.utils.rst | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/source/api/ooni.lib.rst b/docs/source/api/ooni.lib.rst index 79b65be..2fdb61f 100644 --- a/docs/source/api/ooni.lib.rst +++ b/docs/source/api/ooni.lib.rst @@ -9,14 +9,6 @@ lib Package :undoc-members: :show-inheritance: -:mod:`txscapy` Module ---------------------- - -.. automodule:: ooni.lib.txscapy - :members: - :undoc-members: - :show-inheritance: - :mod:`txtraceroute` Module -------------------------- diff --git a/docs/source/api/ooni.utils.rst b/docs/source/api/ooni.utils.rst index 4478eaa..9f8b374 100644 --- a/docs/source/api/ooni.utils.rst +++ b/docs/source/api/ooni.utils.rst @@ -105,6 +105,13 @@ utils Package :undoc-members: :show-inheritance: +:mod:`txscapy` Module +--------------------- + +.. automodule:: ooni.utils.txscapy + :members: + :undoc-members: + :show-inheritance: .. XXX this is commented out because it triggers this error gcooni/utils/onion.py:docstring of

1 0

[ooni-probe/master] Remove unused dependency from docs
by art＠torproject.org 02 Dec '12

02 Dec '12

commit f359c45923c0c13f23486bee78ee36df53b6b57b Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:04:24 2012 +0000 Remove unused dependency from docs --- docs/source/api/ooni.lib.rst | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/docs/source/api/ooni.lib.rst b/docs/source/api/ooni.lib.rst index 2711370..79b65be 100644 --- a/docs/source/api/ooni.lib.rst +++ b/docs/source/api/ooni.lib.rst @@ -9,14 +9,6 @@ lib Package :undoc-members: :show-inheritance: -:mod:`rfc3339` Module ---------------------- - -.. automodule:: ooni.lib.rfc3339 - :members: - :undoc-members: - :show-inheritance: - :mod:`txscapy` Module ---------------------

1 0

[ooni-probe/master] Rename oconfig to config
by art＠torproject.org 02 Dec '12

02 Dec '12

commit aa0763b4408e72dc062fccf84a3f73f4888a2d60 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 14:52:58 2012 +0000 Rename oconfig to config --- docs/source/api/ooni.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/api/ooni.rst b/docs/source/api/ooni.rst index aee4ab6..8e133a3 100644 --- a/docs/source/api/ooni.rst +++ b/docs/source/api/ooni.rst @@ -25,10 +25,10 @@ ooni Package :undoc-members: :show-inheritance: -:mod:`oconfig` Module +:mod:`config` Module --------------------- -.. automodule:: ooni.oconfig +.. automodule:: ooni.config :members: :undoc-members: :show-inheritance:

1 0

[ooni-probe/master] Fix underline for "test random invalid field count"
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 47d294b137c5061173664328e91cc5fcaed92f26 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:52:32 2012 +0000 Fix underline for "test random invalid field count" --- docs/source/tests/http_invalid_request_line.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/source/tests/http_invalid_request_line.rst b/docs/source/tests/http_invalid_request_line.rst index f14a18d..4ac223e 100644 --- a/docs/source/tests/http_invalid_request_line.rst +++ b/docs/source/tests/http_invalid_request_line.rst @@ -46,7 +46,7 @@ The request on the wire will look like this: test random invalid field count -****************************** +******************************* This generates a request that looks like this:

1 0

[ooni-probe/master] Remove doc reference to unknown package date
by art＠torproject.org 02 Dec '12

02 Dec '12

commit ccaab4cc64467ace7cedae9e11730dd285eaf457 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:24:55 2012 +0000 Remove doc reference to unknown package date --- docs/source/api/ooni.utils.rst | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/docs/source/api/ooni.utils.rst b/docs/source/api/ooni.utils.rst index 4097f24..057138b 100644 --- a/docs/source/api/ooni.utils.rst +++ b/docs/source/api/ooni.utils.rst @@ -16,14 +16,6 @@ utils Package :undoc-members: :show-inheritance: -:mod:`date` Module ------------------- - -.. automodule:: ooni.utils.date - :members: - :undoc-members: - :show-inheritance: - :mod:`geodata` Module ---------------------

1 0

[ooni-probe/master] Remove reference to install.rst
by art＠torproject.org 02 Dec '12

02 Dec '12

commit c2dc0cd5ea8d64113e79ca1eb25c3001146f7f31 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:59:48 2012 +0000 Remove reference to install.rst * Installation instructions are now in README.md --- docs/source/index.rst | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index a6687d9..497385b 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -119,7 +119,6 @@ More developer documentation :glob: oonib - install writing_tests api/* glossary

1 0

[ooni-probe/master] Make docstring work with sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 416256bf99fc2c53f721451f03a4a9b88a5c2842 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:21:26 2012 +0000 Make docstring work with sphinx --- ooni/nettest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 4a54414..5e62adb 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -159,7 +159,7 @@ class NetTestCase(object): that you will be able to properly process. For example you may wish to have an input processor that will allow you - to ignore comments in files. This can be easily achieved like so: + to ignore comments in files. This can be easily achieved like so:: fp = open(filename) for x in fp.xreadlines():

1 0

[ooni-probe/master] Make docstring work with sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 045b9f04d7dd2cc24aa3bd396459bb5e400ff5f7 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:26:20 2012 +0000 Make docstring work with sphinx --- ooni/templates/httpt.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 01853f3..eb574be 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -176,7 +176,7 @@ class HTTPTest(NetTestCase): Note: if self.followRedirects is set to True, then this method will never be called. XXX perhaps we may want to hook _handleResponse in RedirectAgent to - call processRedirect every time we get redirected. + call processRedirect every time we get redirected. Args:

1 0

[ooni-probe/master] Add newline to please the Sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 5acfd8072b3f1dff89b3bf7f1f01a15951d72fe1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:31:11 2012 +0000 Add newline to please the Sphinx --- ooni/templates/scapyt.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index a787115..8e6ce9c 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -24,7 +24,8 @@ class BaseScapyTest(NetTestCase): report: sent_packets: [{'raw_packet': BASE64Encoding of packet, - 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'] + 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'}] + answered_packets: [] """

1 0

[ooni-probe/master] Prune kit from docs
by art＠torproject.org 02 Dec '12

02 Dec '12

commit a8c6998acfb3e25653cd2b4b706c49332d71ece8 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:03:04 2012 +0000 Prune kit from docs --- docs/source/api/ooni.kit.rst | 19 ------------------- docs/source/api/ooni.rst | 1 - ooni/kit/__init__.py | 1 + 3 files changed, 1 insertions(+), 20 deletions(-) diff --git a/docs/source/api/ooni.kit.rst b/docs/source/api/ooni.kit.rst deleted file mode 100644 index d870355..0000000 --- a/docs/source/api/ooni.kit.rst +++ /dev/null @@ -1,19 +0,0 @@ -kit Package -=========== - -:mod:`kit` Package ------------------- - -.. automodule:: ooni.kit - :members: - :undoc-members: - :show-inheritance: - -:mod:`domclass` Module ----------------------- - -.. automodule:: ooni.kit.domclass - :members: - :undoc-members: - :show-inheritance: - diff --git a/docs/source/api/ooni.rst b/docs/source/api/ooni.rst index 8e133a3..83b4f83 100644 --- a/docs/source/api/ooni.rst +++ b/docs/source/api/ooni.rst @@ -62,7 +62,6 @@ Subpackages .. toctree:: - ooni.kit ooni.lib ooni.templates ooni.utils diff --git a/ooni/kit/__init__.py b/ooni/kit/__init__.py index 55374c9..9a24fae 100644 --- a/ooni/kit/__init__.py +++ b/ooni/kit/__init__.py @@ -1 +1,2 @@ __all__ = ['domclass'] +from . import domclass

1 0