aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/pathoc_cmdline.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-07-24 17:43:41 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-07-24 17:43:41 +0200
commitf8b4d666870163d6770aabefe212b8ecd981d490 (patch)
tree8c6f2fc9ef4c06c40a04514f651785540d278bf3 /libpathod/pathoc_cmdline.py
parent9a1bee31d6d7b92bf5b4cb68d853c856acdfb036 (diff)
parent96c9c4459f0bb9b76ab34f8c8d03d0e5d28621f4 (diff)
downloadmitmproxy-f8b4d666870163d6770aabefe212b8ecd981d490.tar.gz
mitmproxy-f8b4d666870163d6770aabefe212b8ecd981d490.tar.bz2
mitmproxy-f8b4d666870163d6770aabefe212b8ecd981d490.zip
Merge pull request #31 from Kriechi/protocol-refactor
HTTP protocol refactoring
Diffstat (limited to 'libpathod/pathoc_cmdline.py')
-rw-r--r--libpathod/pathoc_cmdline.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libpathod/pathoc_cmdline.py b/libpathod/pathoc_cmdline.py
index 8b25b4a1..58963265 100644
--- a/libpathod/pathoc_cmdline.py
+++ b/libpathod/pathoc_cmdline.py
@@ -3,7 +3,8 @@ import argparse
import os
import os.path
-from netlib import http_uastrings, tcp
+from netlib import tcp
+from netlib.http import user_agents
from . import pathoc, version, language
@@ -16,7 +17,7 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr):
pa = preparser.parse_known_args(argv)[0]
if pa.showua:
print >> stdout, "User agent strings:"
- for i in http_uastrings.UASTRINGS:
+ for i in user_agents.UASTRINGS:
print >> stdout, " ", i[1], i[0]
sys.exit(0)