Move most pcap2har .py files into a library directory

sboisson · Jul 17, 2012 · b557365 · b557365
1 parent 2b619a4
commit b557365
Show file tree

Hide file tree

Showing 30 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 pcap2har.log
 tests/*.har
 tests/*.log
+*.sw[op]
diff --git a/main.py b/main.py
@@ -4,18 +4,19 @@
 Main program that converts pcaps to HAR's.
 '''
 
-import pcap
 import os
 import optparse
 import logging
 import sys
-import http
-import httpsession
-import har
 import json
-import tcp
-import settings
-from packetdispatcher import PacketDispatcher
+
+from pcap2har import pcap
+from pcap2har import http
+from pcap2har import httpsession
+from pcap2har import har
+from pcap2har import tcp
+from pcap2har import settings
+from pcap2har.packetdispatcher import PacketDispatcher
 
 # get cmdline args/options
 parser = optparse.OptionParser(

diff --git a/BeautifulSoup.py → pcap2har/BeautifulSoup.py b/BeautifulSoup.py → pcap2har/BeautifulSoup.py
diff --git a/__init__.py → pcap2har/__init__.py b/__init__.py → pcap2har/__init__.py
diff --git a/dns.py → pcap2har/dns.py b/dns.py → pcap2har/dns.py
diff --git a/dpkt_http_replacement.py → pcap2har/dpkt_http_replacement.py b/dpkt_http_replacement.py → pcap2har/dpkt_http_replacement.py
diff --git a/har.py → pcap2har/har.py b/har.py → pcap2har/har.py
diff --git a/http/__init__.py → pcap2har/http/__init__.py b/http/__init__.py → pcap2har/http/__init__.py
diff --git a/http/common.py → pcap2har/http/common.py b/http/common.py → pcap2har/http/common.py
diff --git a/http/flow.py → pcap2har/http/flow.py b/http/flow.py → pcap2har/http/flow.py
diff --git a/http/message.py → pcap2har/http/message.py b/http/message.py → pcap2har/http/message.py
diff --git a/http/request.py → pcap2har/http/request.py b/http/request.py → pcap2har/http/request.py
diff --git a/http/response.py → pcap2har/http/response.py b/http/response.py → pcap2har/http/response.py
diff --git a/httpsession.py → pcap2har/httpsession.py b/httpsession.py → pcap2har/httpsession.py
diff --git a/mediatype.py → pcap2har/mediatype.py b/mediatype.py → pcap2har/mediatype.py
diff --git a/packetdispatcher.py → pcap2har/packetdispatcher.py b/packetdispatcher.py → pcap2har/packetdispatcher.py
diff --git a/pagetracker.py → pcap2har/pagetracker.py b/pagetracker.py → pcap2har/pagetracker.py
diff --git a/pcap.py → pcap2har/pcap.py b/pcap.py → pcap2har/pcap.py
diff --git a/pcaputil.py → pcap2har/pcaputil.py b/pcaputil.py → pcap2har/pcaputil.py
diff --git a/settings.py → pcap2har/settings.py b/settings.py → pcap2har/settings.py
diff --git a/sortedcollection.py → pcap2har/sortedcollection.py b/sortedcollection.py → pcap2har/sortedcollection.py
diff --git a/tcp/__init__.py → pcap2har/tcp/__init__.py b/tcp/__init__.py → pcap2har/tcp/__init__.py
diff --git a/tcp/chunk.py → pcap2har/tcp/chunk.py b/tcp/chunk.py → pcap2har/tcp/chunk.py
diff --git a/tcp/common.py → pcap2har/tcp/common.py b/tcp/common.py → pcap2har/tcp/common.py
diff --git a/tcp/direction.py → pcap2har/tcp/direction.py b/tcp/direction.py → pcap2har/tcp/direction.py
diff --git a/tcp/flow.py → pcap2har/tcp/flow.py b/tcp/flow.py → pcap2har/tcp/flow.py
diff --git a/tcp/flowbuilder.py → pcap2har/tcp/flowbuilder.py b/tcp/flowbuilder.py → pcap2har/tcp/flowbuilder.py
diff --git a/tcp/packet.py → pcap2har/tcp/packet.py b/tcp/packet.py → pcap2har/tcp/packet.py
diff --git a/tcp/seq.py → pcap2har/tcp/seq.py b/tcp/seq.py → pcap2har/tcp/seq.py
diff --git a/udp.py → pcap2har/udp.py b/udp.py → pcap2har/udp.py