aboutsummaryrefslogtreecommitdiffstats
path: root/pathod
diff options
context:
space:
mode:
Diffstat (limited to 'pathod')
-rwxr-xr-xpathod/.sources/make8
-rw-r--r--pathod/MANIFEST.in2
-rw-r--r--pathod/README.rst2
-rwxr-xr-xpathod/bin/pathoc (renamed from pathod/pathoc)2
-rwxr-xr-xpathod/bin/pathod (renamed from pathod/pathod)2
-rw-r--r--pathod/examples/libpathod_pathoc.py2
-rw-r--r--pathod/examples/test_context.py2
-rw-r--r--pathod/examples/test_setup.py2
-rw-r--r--pathod/examples/test_setupall.py2
-rw-r--r--pathod/libpathod/templates/libpathod_pathoc.html8
-rw-r--r--pathod/pathod/__init__.py (renamed from pathod/libpathod/__init__.py)0
-rw-r--r--pathod/pathod/app.py (renamed from pathod/libpathod/app.py)6
-rw-r--r--pathod/pathod/language/__init__.py (renamed from pathod/libpathod/language/__init__.py)0
-rw-r--r--pathod/pathod/language/actions.py (renamed from pathod/libpathod/language/actions.py)0
-rw-r--r--pathod/pathod/language/base.py (renamed from pathod/libpathod/language/base.py)0
-rw-r--r--pathod/pathod/language/exceptions.py (renamed from pathod/libpathod/language/exceptions.py)0
-rw-r--r--pathod/pathod/language/generators.py (renamed from pathod/libpathod/language/generators.py)0
-rw-r--r--pathod/pathod/language/http.py (renamed from pathod/libpathod/language/http.py)0
-rw-r--r--pathod/pathod/language/http2.py (renamed from pathod/libpathod/language/http2.py)0
-rw-r--r--pathod/pathod/language/message.py (renamed from pathod/libpathod/language/message.py)0
-rw-r--r--pathod/pathod/language/websockets.py (renamed from pathod/libpathod/language/websockets.py)0
-rw-r--r--pathod/pathod/language/writer.py (renamed from pathod/libpathod/language/writer.py)0
-rw-r--r--pathod/pathod/log.py (renamed from pathod/libpathod/log.py)0
-rw-r--r--pathod/pathod/pathoc.py (renamed from pathod/libpathod/pathoc.py)0
-rw-r--r--pathod/pathod/pathoc_cmdline.py (renamed from pathod/libpathod/pathoc_cmdline.py)0
-rw-r--r--pathod/pathod/pathod.py (renamed from pathod/libpathod/pathod.py)0
-rw-r--r--pathod/pathod/pathod_cmdline.py (renamed from pathod/libpathod/pathod_cmdline.py)0
-rw-r--r--pathod/pathod/protocols/__init__.py (renamed from pathod/libpathod/protocols/__init__.py)0
-rw-r--r--pathod/pathod/protocols/http.py (renamed from pathod/libpathod/protocols/http.py)0
-rw-r--r--pathod/pathod/protocols/http2.py (renamed from pathod/libpathod/protocols/http2.py)0
-rw-r--r--pathod/pathod/protocols/websockets.py (renamed from pathod/libpathod/protocols/websockets.py)0
-rw-r--r--pathod/pathod/static/bootstrap.min.css (renamed from pathod/libpathod/static/bootstrap.min.css)0
-rw-r--r--pathod/pathod/static/bootstrap.min.js (renamed from pathod/libpathod/static/bootstrap.min.js)0
-rw-r--r--pathod/pathod/static/jquery-1.7.2.min.js (renamed from pathod/libpathod/static/jquery-1.7.2.min.js)0
-rw-r--r--pathod/pathod/static/jquery.localscroll-min.js (renamed from pathod/libpathod/static/jquery.localscroll-min.js)0
-rw-r--r--pathod/pathod/static/jquery.scrollTo-min.js (renamed from pathod/libpathod/static/jquery.scrollTo-min.js)0
-rw-r--r--pathod/pathod/static/pathod.css (renamed from pathod/libpathod/static/pathod.css)0
-rw-r--r--pathod/pathod/static/start_quote.png (renamed from pathod/libpathod/static/start_quote.png)bin376 -> 376 bytes
-rw-r--r--pathod/pathod/static/syntax.css (renamed from pathod/libpathod/static/syntax.css)0
-rw-r--r--pathod/pathod/static/torture.png (renamed from pathod/libpathod/static/torture.png)bin108327 -> 108327 bytes
-rw-r--r--pathod/pathod/templates/about.html (renamed from pathod/libpathod/templates/about.html)0
-rw-r--r--pathod/pathod/templates/docframe.html (renamed from pathod/libpathod/templates/docframe.html)4
-rw-r--r--pathod/pathod/templates/docs_lang.html (renamed from pathod/libpathod/templates/docs_lang.html)0
-rw-r--r--pathod/pathod/templates/docs_lang_requests.html (renamed from pathod/libpathod/templates/docs_lang_requests.html)0
-rw-r--r--pathod/pathod/templates/docs_lang_responses.html (renamed from pathod/libpathod/templates/docs_lang_responses.html)0
-rw-r--r--pathod/pathod/templates/docs_lang_websockets.html (renamed from pathod/libpathod/templates/docs_lang_websockets.html)0
-rw-r--r--pathod/pathod/templates/docs_libpathod.html (renamed from pathod/libpathod/templates/docs_libpathod.html)6
-rw-r--r--pathod/pathod/templates/docs_pathoc.html (renamed from pathod/libpathod/templates/docs_pathoc.html)0
-rw-r--r--pathod/pathod/templates/docs_pathod.html (renamed from pathod/libpathod/templates/docs_pathod.html)0
-rw-r--r--pathod/pathod/templates/docs_test.html (renamed from pathod/libpathod/templates/docs_test.html)8
-rw-r--r--pathod/pathod/templates/download.html (renamed from pathod/libpathod/templates/download.html)0
-rw-r--r--pathod/pathod/templates/examples_context.html (renamed from pathod/libpathod/templates/examples_context.html)2
-rw-r--r--pathod/pathod/templates/examples_setup.html (renamed from pathod/libpathod/templates/examples_setup.html)2
-rw-r--r--pathod/pathod/templates/examples_setupall.html (renamed from pathod/libpathod/templates/examples_setupall.html)2
-rw-r--r--pathod/pathod/templates/frame.html (renamed from pathod/libpathod/templates/frame.html)0
-rw-r--r--pathod/pathod/templates/index.html (renamed from pathod/libpathod/templates/index.html)0
-rw-r--r--pathod/pathod/templates/layout.html (renamed from pathod/libpathod/templates/layout.html)0
-rw-r--r--pathod/pathod/templates/log.html (renamed from pathod/libpathod/templates/log.html)0
-rw-r--r--pathod/pathod/templates/onelog.html (renamed from pathod/libpathod/templates/onelog.html)0
-rw-r--r--pathod/pathod/templates/request_preview.html (renamed from pathod/libpathod/templates/request_preview.html)0
-rw-r--r--pathod/pathod/templates/request_previewform.html (renamed from pathod/libpathod/templates/request_previewform.html)0
-rw-r--r--pathod/pathod/templates/response_preview.html (renamed from pathod/libpathod/templates/response_preview.html)0
-rw-r--r--pathod/pathod/templates/response_previewform.html (renamed from pathod/libpathod/templates/response_previewform.html)0
-rw-r--r--pathod/pathod/test.py (renamed from pathod/libpathod/test.py)0
-rw-r--r--pathod/pathod/utils.py (renamed from pathod/libpathod/utils.py)0
-rw-r--r--pathod/pathod/version.py (renamed from pathod/libpathod/version.py)0
-rw-r--r--pathod/setup.py6
67 files changed, 30 insertions, 38 deletions
diff --git a/pathod/.sources/make b/pathod/.sources/make
index 1c8b1d69..94648859 100755
--- a/pathod/.sources/make
+++ b/pathod/.sources/make
@@ -1,5 +1,5 @@
#!/bin/sh
-pygmentize -f html ../examples/test_context.py > ../libpathod/templates/examples_context.html
-pygmentize -f html ../examples/test_setup.py > ../libpathod/templates/examples_setup.html
-pygmentize -f html ../examples/test_setupall.py > ../libpathod/templates/examples_setupall.html
-pygmentize -f html ../examples/libpathod_pathoc.py > ../libpathod/templates/libpathod_pathoc.html
+pygmentize -f html ../examples/test_context.py > ../pathod/templates/examples_context.html
+pygmentize -f html ../examples/test_setup.py > ../pathod/templates/examples_setup.html
+pygmentize -f html ../examples/test_setupall.py > ../pathod/templates/examples_setupall.html
+pygmentize -f html ../examples/pathod_pathoc.py > ../pathod/templates/pathod_pathoc.html
diff --git a/pathod/MANIFEST.in b/pathod/MANIFEST.in
index fb7b776c..a83fa08f 100644
--- a/pathod/MANIFEST.in
+++ b/pathod/MANIFEST.in
@@ -1,2 +1,2 @@
-graft libpathod
+graft pathod
recursive-exclude * *.pyc *.pyo *.swo *.swp *.map \ No newline at end of file
diff --git a/pathod/README.rst b/pathod/README.rst
index 5593e053..fbedc5ba 100644
--- a/pathod/README.rst
+++ b/pathod/README.rst
@@ -8,7 +8,7 @@ clients and servers. The project has three components:
- ``pathod``, an pathological HTTP daemon.
- ``pathoc``, a perverse HTTP client.
-- ``libpathod.test``, an API for easily using pathod and pathoc in unit tests.
+- ``pathod.test``, an API for easily using pathod and pathoc in unit tests.
Installing
----------
diff --git a/pathod/pathoc b/pathod/bin/pathoc
index b3121611..ab62d631 100755
--- a/pathod/pathoc
+++ b/pathod/bin/pathoc
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from libpathod import pathoc_cmdline as cmdline
+from pathod import pathoc_cmdline as cmdline
if __name__ == "__main__":
cmdline.go_pathoc()
diff --git a/pathod/pathod b/pathod/bin/pathod
index a79becf1..af0c118b 100755
--- a/pathod/pathod
+++ b/pathod/bin/pathod
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from libpathod import pathod_cmdline as cmdline
+from pathod import pathod_cmdline as cmdline
if __name__ == "__main__":
cmdline.go_pathod()
diff --git a/pathod/examples/libpathod_pathoc.py b/pathod/examples/libpathod_pathoc.py
index cf94151b..587c0e4c 100644
--- a/pathod/examples/libpathod_pathoc.py
+++ b/pathod/examples/libpathod_pathoc.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-from libpathod import pathoc
+from pathod import pathoc
p = pathoc.Pathoc(("google.com", 80))
p.connect()
diff --git a/pathod/examples/test_context.py b/pathod/examples/test_context.py
index 7c0386c1..8db4331f 100644
--- a/pathod/examples/test_context.py
+++ b/pathod/examples/test_context.py
@@ -1,5 +1,5 @@
import requests
-from libpathod import test
+from pathod import test
def test_simple():
diff --git a/pathod/examples/test_setup.py b/pathod/examples/test_setup.py
index 6085c98a..5dbc456d 100644
--- a/pathod/examples/test_setup.py
+++ b/pathod/examples/test_setup.py
@@ -1,5 +1,5 @@
import requests
-from libpathod import test
+from pathod import test
class Test:
diff --git a/pathod/examples/test_setupall.py b/pathod/examples/test_setupall.py
index f0ba5844..cb84b7b2 100644
--- a/pathod/examples/test_setupall.py
+++ b/pathod/examples/test_setupall.py
@@ -1,5 +1,5 @@
import requests
-from libpathod import test
+from pathod import test
class Test:
diff --git a/pathod/libpathod/templates/libpathod_pathoc.html b/pathod/libpathod/templates/libpathod_pathoc.html
deleted file mode 100644
index f5871b16..00000000
--- a/pathod/libpathod/templates/libpathod_pathoc.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="highlight"><pre><span class="c">#!/usr/bin/env python</span>
-<span class="kn">from</span> <span class="nn">libpathod</span> <span class="kn">import</span> <span class="n">pathoc</span>
-
-<span class="n">p</span> <span class="o">=</span> <span class="n">pathoc</span><span class="o">.</span><span class="n">Pathoc</span><span class="p">((</span><span class="s">&quot;google.com&quot;</span><span class="p">,</span> <span class="mi">80</span><span class="p">))</span>
-<span class="n">p</span><span class="o">.</span><span class="n">connect</span><span class="p">()</span>
-<span class="k">print</span> <span class="n">p</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;get:/&quot;</span><span class="p">)</span>
-<span class="k">print</span> <span class="n">p</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;get:/foo&quot;</span><span class="p">)</span>
-</pre></div>
diff --git a/pathod/libpathod/__init__.py b/pathod/pathod/__init__.py
index e69de29b..e69de29b 100644
--- a/pathod/libpathod/__init__.py
+++ b/pathod/pathod/__init__.py
diff --git a/pathod/libpathod/app.py b/pathod/pathod/app.py
index debebaf2..c6b7eabc 100644
--- a/pathod/libpathod/app.py
+++ b/pathod/pathod/app.py
@@ -86,10 +86,10 @@ def make_app(noapi, debug):
"docs_pathoc.html", True, section="docs", subsection="pathoc"
)
- @app.route('/docs/libpathod')
- def docs_libpathod():
+ @app.route('/docs/lib_pathod')
+ def docs_lib_pathod():
return render(
- "docs_libpathod.html", True, section="docs", subsection="libpathod"
+ "docs_lib_pathod.html", True, section="docs", subsection="pathod"
)
@app.route('/docs/test')
diff --git a/pathod/libpathod/language/__init__.py b/pathod/pathod/language/__init__.py
index 32199e08..32199e08 100644
--- a/pathod/libpathod/language/__init__.py
+++ b/pathod/pathod/language/__init__.py
diff --git a/pathod/libpathod/language/actions.py b/pathod/pathod/language/actions.py
index 34a9bafb..34a9bafb 100644
--- a/pathod/libpathod/language/actions.py
+++ b/pathod/pathod/language/actions.py
diff --git a/pathod/libpathod/language/base.py b/pathod/pathod/language/base.py
index a4302998..a4302998 100644
--- a/pathod/libpathod/language/base.py
+++ b/pathod/pathod/language/base.py
diff --git a/pathod/libpathod/language/exceptions.py b/pathod/pathod/language/exceptions.py
index 84ad3c02..84ad3c02 100644
--- a/pathod/libpathod/language/exceptions.py
+++ b/pathod/pathod/language/exceptions.py
diff --git a/pathod/libpathod/language/generators.py b/pathod/pathod/language/generators.py
index a17e7052..a17e7052 100644
--- a/pathod/libpathod/language/generators.py
+++ b/pathod/pathod/language/generators.py
diff --git a/pathod/libpathod/language/http.py b/pathod/pathod/language/http.py
index a82f12fe..a82f12fe 100644
--- a/pathod/libpathod/language/http.py
+++ b/pathod/pathod/language/http.py
diff --git a/pathod/libpathod/language/http2.py b/pathod/pathod/language/http2.py
index d5e3ca31..d5e3ca31 100644
--- a/pathod/libpathod/language/http2.py
+++ b/pathod/pathod/language/http2.py
diff --git a/pathod/libpathod/language/message.py b/pathod/pathod/language/message.py
index 33124856..33124856 100644
--- a/pathod/libpathod/language/message.py
+++ b/pathod/pathod/language/message.py
diff --git a/pathod/libpathod/language/websockets.py b/pathod/pathod/language/websockets.py
index ea7c870e..ea7c870e 100644
--- a/pathod/libpathod/language/websockets.py
+++ b/pathod/pathod/language/websockets.py
diff --git a/pathod/libpathod/language/writer.py b/pathod/pathod/language/writer.py
index 1a27e1ef..1a27e1ef 100644
--- a/pathod/libpathod/language/writer.py
+++ b/pathod/pathod/language/writer.py
diff --git a/pathod/libpathod/log.py b/pathod/pathod/log.py
index f203542f..f203542f 100644
--- a/pathod/libpathod/log.py
+++ b/pathod/pathod/log.py
diff --git a/pathod/libpathod/pathoc.py b/pathod/pathod/pathoc.py
index c0a33b62..c0a33b62 100644
--- a/pathod/libpathod/pathoc.py
+++ b/pathod/pathod/pathoc.py
diff --git a/pathod/libpathod/pathoc_cmdline.py b/pathod/pathod/pathoc_cmdline.py
index bf827a9a..bf827a9a 100644
--- a/pathod/libpathod/pathoc_cmdline.py
+++ b/pathod/pathod/pathoc_cmdline.py
diff --git a/pathod/libpathod/pathod.py b/pathod/pathod/pathod.py
index 55e75074..55e75074 100644
--- a/pathod/libpathod/pathod.py
+++ b/pathod/pathod/pathod.py
diff --git a/pathod/libpathod/pathod_cmdline.py b/pathod/pathod/pathod_cmdline.py
index c9272249..c9272249 100644
--- a/pathod/libpathod/pathod_cmdline.py
+++ b/pathod/pathod/pathod_cmdline.py
diff --git a/pathod/libpathod/protocols/__init__.py b/pathod/pathod/protocols/__init__.py
index 1a8c7dab..1a8c7dab 100644
--- a/pathod/libpathod/protocols/__init__.py
+++ b/pathod/pathod/protocols/__init__.py
diff --git a/pathod/libpathod/protocols/http.py b/pathod/pathod/protocols/http.py
index 1f1765cb..1f1765cb 100644
--- a/pathod/libpathod/protocols/http.py
+++ b/pathod/pathod/protocols/http.py
diff --git a/pathod/libpathod/protocols/http2.py b/pathod/pathod/protocols/http2.py
index a098a14e..a098a14e 100644
--- a/pathod/libpathod/protocols/http2.py
+++ b/pathod/pathod/protocols/http2.py
diff --git a/pathod/libpathod/protocols/websockets.py b/pathod/pathod/protocols/websockets.py
index 134d27bc..134d27bc 100644
--- a/pathod/libpathod/protocols/websockets.py
+++ b/pathod/pathod/protocols/websockets.py
diff --git a/pathod/libpathod/static/bootstrap.min.css b/pathod/pathod/static/bootstrap.min.css
index 2e79d91a..2e79d91a 100644
--- a/pathod/libpathod/static/bootstrap.min.css
+++ b/pathod/pathod/static/bootstrap.min.css
diff --git a/pathod/libpathod/static/bootstrap.min.js b/pathod/pathod/static/bootstrap.min.js
index 14356981..14356981 100644
--- a/pathod/libpathod/static/bootstrap.min.js
+++ b/pathod/pathod/static/bootstrap.min.js
diff --git a/pathod/libpathod/static/jquery-1.7.2.min.js b/pathod/pathod/static/jquery-1.7.2.min.js
index 16ad06c5..16ad06c5 100644
--- a/pathod/libpathod/static/jquery-1.7.2.min.js
+++ b/pathod/pathod/static/jquery-1.7.2.min.js
diff --git a/pathod/libpathod/static/jquery.localscroll-min.js b/pathod/pathod/static/jquery.localscroll-min.js
index 3f8d64cc..3f8d64cc 100644
--- a/pathod/libpathod/static/jquery.localscroll-min.js
+++ b/pathod/pathod/static/jquery.localscroll-min.js
diff --git a/pathod/libpathod/static/jquery.scrollTo-min.js b/pathod/pathod/static/jquery.scrollTo-min.js
index 7d4001dc..7d4001dc 100644
--- a/pathod/libpathod/static/jquery.scrollTo-min.js
+++ b/pathod/pathod/static/jquery.scrollTo-min.js
diff --git a/pathod/libpathod/static/pathod.css b/pathod/pathod/static/pathod.css
index 8b23b4d5..8b23b4d5 100644
--- a/pathod/libpathod/static/pathod.css
+++ b/pathod/pathod/static/pathod.css
diff --git a/pathod/libpathod/static/start_quote.png b/pathod/pathod/static/start_quote.png
index 8090f6e8..8090f6e8 100644
--- a/pathod/libpathod/static/start_quote.png
+++ b/pathod/pathod/static/start_quote.png
Binary files differ
diff --git a/pathod/libpathod/static/syntax.css b/pathod/pathod/static/syntax.css
index e371658a..e371658a 100644
--- a/pathod/libpathod/static/syntax.css
+++ b/pathod/pathod/static/syntax.css
diff --git a/pathod/libpathod/static/torture.png b/pathod/pathod/static/torture.png
index 50e245ea..50e245ea 100644
--- a/pathod/libpathod/static/torture.png
+++ b/pathod/pathod/static/torture.png
Binary files differ
diff --git a/pathod/libpathod/templates/about.html b/pathod/pathod/templates/about.html
index 340dc386..340dc386 100644
--- a/pathod/libpathod/templates/about.html
+++ b/pathod/pathod/templates/about.html
diff --git a/pathod/libpathod/templates/docframe.html b/pathod/pathod/templates/docframe.html
index 4cbdeebc..797de20a 100644
--- a/pathod/libpathod/templates/docframe.html
+++ b/pathod/pathod/templates/docframe.html
@@ -14,8 +14,8 @@
<li {{subs( "pathod")}}><a href="/docs/pathod">pathod</a></li>
<li {{subs( "pathoc")}}><a href="/docs/pathoc">pathoc</a></li>
<li {{subs( "lang")}}><a href="/docs/language">language</a></li>
- <li {{subs( "libpathod")}}><a href="/docs/libpathod">libpathod</a></li>
- <li {{subs( "test")}}><a href="/docs/test">libpathod.test</a></li>
+ <li {{subs( "pathod")}}><a href="/docs/pathod">pathod</a></li>
+ <li {{subs( "test")}}><a href="/docs/test">pathod.test</a></li>
</ul>
</div>
</div>
diff --git a/pathod/libpathod/templates/docs_lang.html b/pathod/pathod/templates/docs_lang.html
index a1d22aef..a1d22aef 100644
--- a/pathod/libpathod/templates/docs_lang.html
+++ b/pathod/pathod/templates/docs_lang.html
diff --git a/pathod/libpathod/templates/docs_lang_requests.html b/pathod/pathod/templates/docs_lang_requests.html
index 81aff535..81aff535 100644
--- a/pathod/libpathod/templates/docs_lang_requests.html
+++ b/pathod/pathod/templates/docs_lang_requests.html
diff --git a/pathod/libpathod/templates/docs_lang_responses.html b/pathod/pathod/templates/docs_lang_responses.html
index 9a85ff1a..9a85ff1a 100644
--- a/pathod/libpathod/templates/docs_lang_responses.html
+++ b/pathod/pathod/templates/docs_lang_responses.html
diff --git a/pathod/libpathod/templates/docs_lang_websockets.html b/pathod/pathod/templates/docs_lang_websockets.html
index dd318e0b..dd318e0b 100644
--- a/pathod/libpathod/templates/docs_lang_websockets.html
+++ b/pathod/pathod/templates/docs_lang_websockets.html
diff --git a/pathod/libpathod/templates/docs_libpathod.html b/pathod/pathod/templates/docs_libpathod.html
index 6d504fe5..8eb6846a 100644
--- a/pathod/libpathod/templates/docs_libpathod.html
+++ b/pathod/pathod/templates/docs_libpathod.html
@@ -1,7 +1,7 @@
{% extends "docframe.html" %} {% block body %}
<div class="page-header">
<h1>
- libpathod
+ pathod
<small>Using pathod and pathoc in code.</small>
</h1>
</div>
@@ -9,7 +9,7 @@
<div class="row">
<div class="span6">
<p>
- Behind the pathod and pathoc command-line tools lurks <b>libpathod</b>,
+ Behind the pathod and pathoc command-line tools lurks <b>pathod</b>,
a powerful library for manipulating and serving HTTP requests and responses.
The canonical documentation for the library is in the code, and can be
accessed using pydoc.
@@ -17,7 +17,7 @@
</div>
<div class="span6">
<h1>pathoc</h1>
- {% include "libpathod_pathoc.html" %}
+ {% include "pathod_pathoc.html" %}
</div>
</div>
{% endblock %}
diff --git a/pathod/libpathod/templates/docs_pathoc.html b/pathod/pathod/templates/docs_pathoc.html
index d38c3a77..d38c3a77 100644
--- a/pathod/libpathod/templates/docs_pathoc.html
+++ b/pathod/pathod/templates/docs_pathoc.html
diff --git a/pathod/libpathod/templates/docs_pathod.html b/pathod/pathod/templates/docs_pathod.html
index 0d0ae933..0d0ae933 100644
--- a/pathod/libpathod/templates/docs_pathod.html
+++ b/pathod/pathod/templates/docs_pathod.html
diff --git a/pathod/libpathod/templates/docs_test.html b/pathod/pathod/templates/docs_test.html
index 0502c984..ecd84bc7 100644
--- a/pathod/libpathod/templates/docs_test.html
+++ b/pathod/pathod/templates/docs_test.html
@@ -1,12 +1,12 @@
{% extends "docframe.html" %} {% block body %}
<div class="page-header">
<h1>
- libpathod.test
- <small>Using libpathod in unit tests.</small>
+ pathod.test
+ <small>Using pathod in unit tests.</small>
</h1>
</div>
-<p>The <b>libpathod.test</b> module is a light, flexible testing layer for HTTP clients.
+<p>The <b>pathod.test</b> module is a light, flexible testing layer for HTTP clients.
It works by firing up a Pathod instance in a separate thread, letting you use
Pathod's full abilities to generate responses, and then query Pathod's internal
logs to establish what happened. All the mechanics of startup, shutdown, finding
@@ -15,7 +15,7 @@
<p>The canonical docs can be accessed using pydoc: </p>
-<pre class="terminal">pydoc libpathod.test</pre>
+<pre class="terminal">pydoc pathod.test</pre>
<p>
The remainder of this page demonstrates some common interaction patterns using
diff --git a/pathod/libpathod/templates/download.html b/pathod/pathod/templates/download.html
index bd8950e8..bd8950e8 100644
--- a/pathod/libpathod/templates/download.html
+++ b/pathod/pathod/templates/download.html
diff --git a/pathod/libpathod/templates/examples_context.html b/pathod/pathod/templates/examples_context.html
index afb3bd48..20b02c39 100644
--- a/pathod/libpathod/templates/examples_context.html
+++ b/pathod/pathod/templates/examples_context.html
@@ -1,5 +1,5 @@
<div class="highlight"><pre><span class="kn">import</span> <span class="nn">requests</span>
-<span class="kn">from</span> <span class="nn">libpathod</span> <span class="kn">import</span> <span class="n">test</span>
+<span class="kn">from</span> <span class="nn">pathod</span> <span class="kn">import</span> <span class="n">test</span>
<span class="k">def</span> <span class="nf">test_simple</span><span class="p">():</span>
diff --git a/pathod/libpathod/templates/examples_setup.html b/pathod/pathod/templates/examples_setup.html
index c2da1cd1..b8419171 100644
--- a/pathod/libpathod/templates/examples_setup.html
+++ b/pathod/pathod/templates/examples_setup.html
@@ -1,5 +1,5 @@
<div class="highlight"><pre><span class="kn">import</span> <span class="nn">requests</span>
-<span class="kn">from</span> <span class="nn">libpathod</span> <span class="kn">import</span> <span class="n">test</span>
+<span class="kn">from</span> <span class="nn">pathod</span> <span class="kn">import</span> <span class="n">test</span>
<span class="k">class</span> <span class="nc">Test</span><span class="p">:</span>
diff --git a/pathod/libpathod/templates/examples_setupall.html b/pathod/pathod/templates/examples_setupall.html
index 629d11e0..3308f6cb 100644
--- a/pathod/libpathod/templates/examples_setupall.html
+++ b/pathod/pathod/templates/examples_setupall.html
@@ -1,5 +1,5 @@
<div class="highlight"><pre><span class="kn">import</span> <span class="nn">requests</span>
-<span class="kn">from</span> <span class="nn">libpathod</span> <span class="kn">import</span> <span class="n">test</span>
+<span class="kn">from</span> <span class="nn">pathod</span> <span class="kn">import</span> <span class="n">test</span>
<span class="k">class</span> <span class="nc">Test</span><span class="p">:</span>
diff --git a/pathod/libpathod/templates/frame.html b/pathod/pathod/templates/frame.html
index 4223458d..4223458d 100644
--- a/pathod/libpathod/templates/frame.html
+++ b/pathod/pathod/templates/frame.html
diff --git a/pathod/libpathod/templates/index.html b/pathod/pathod/templates/index.html
index a85a4040..a85a4040 100644
--- a/pathod/libpathod/templates/index.html
+++ b/pathod/pathod/templates/index.html
diff --git a/pathod/libpathod/templates/layout.html b/pathod/pathod/templates/layout.html
index af2857b1..af2857b1 100644
--- a/pathod/libpathod/templates/layout.html
+++ b/pathod/pathod/templates/layout.html
diff --git a/pathod/libpathod/templates/log.html b/pathod/pathod/templates/log.html
index b0484cb8..b0484cb8 100644
--- a/pathod/libpathod/templates/log.html
+++ b/pathod/pathod/templates/log.html
diff --git a/pathod/libpathod/templates/onelog.html b/pathod/pathod/templates/onelog.html
index c222ad60..c222ad60 100644
--- a/pathod/libpathod/templates/onelog.html
+++ b/pathod/pathod/templates/onelog.html
diff --git a/pathod/libpathod/templates/request_preview.html b/pathod/pathod/templates/request_preview.html
index 25d73679..25d73679 100644
--- a/pathod/libpathod/templates/request_preview.html
+++ b/pathod/pathod/templates/request_preview.html
diff --git a/pathod/libpathod/templates/request_previewform.html b/pathod/pathod/templates/request_previewform.html
index 91b5598a..91b5598a 100644
--- a/pathod/libpathod/templates/request_previewform.html
+++ b/pathod/pathod/templates/request_previewform.html
diff --git a/pathod/libpathod/templates/response_preview.html b/pathod/pathod/templates/response_preview.html
index bbce6d6c..bbce6d6c 100644
--- a/pathod/libpathod/templates/response_preview.html
+++ b/pathod/pathod/templates/response_preview.html
diff --git a/pathod/libpathod/templates/response_previewform.html b/pathod/pathod/templates/response_previewform.html
index d46043f3..d46043f3 100644
--- a/pathod/libpathod/templates/response_previewform.html
+++ b/pathod/pathod/templates/response_previewform.html
diff --git a/pathod/libpathod/test.py b/pathod/pathod/test.py
index 33a6b763..33a6b763 100644
--- a/pathod/libpathod/test.py
+++ b/pathod/pathod/test.py
diff --git a/pathod/libpathod/utils.py b/pathod/pathod/utils.py
index a1109a3c..a1109a3c 100644
--- a/pathod/libpathod/utils.py
+++ b/pathod/pathod/utils.py
diff --git a/pathod/libpathod/version.py b/pathod/pathod/version.py
index 63f60a8d..63f60a8d 100644
--- a/pathod/libpathod/version.py
+++ b/pathod/pathod/version.py
diff --git a/pathod/setup.py b/pathod/setup.py
index faec47f2..23e26f42 100644
--- a/pathod/setup.py
+++ b/pathod/setup.py
@@ -9,7 +9,7 @@ import sys
here = os.path.abspath(os.path.dirname(__file__))
sys.path.append(os.path.join(here, "..", "netlib"))
-from libpathod import version
+from pathod import version
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
@@ -42,8 +42,8 @@ setup(
include_package_data=True,
entry_points={
'console_scripts': [
- "pathod = libpathod.pathod_cmdline:go_pathod",
- "pathoc = libpathod.pathoc_cmdline:go_pathoc"
+ "pathod = pathod.pathod_cmdline:go_pathod",
+ "pathoc = pathod.pathoc_cmdline:go_pathoc"
]
},
install_requires=[