merge

scapy/supersocket.py

@@ -6,6 +6,7 @@
 import socket,time
 from config import conf
 from data import *
+from sendrecv import sndrcv
 
 class _SuperSocket_metaclass(type):
     def __repr__(self):

setup.py

@@ -38,7 +38,7 @@ archive_util.ARCHIVE_FORMATS["ezip"] = (make_ezipfile,[],'Executable ZIP file')
 setup(
     name = 'scapy',
     version = '2.0.1-dev', 
-    packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
+    packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
     scripts = ['bin/scapy','bin/UTscapy'],
     data_files = [('share/man/man1', ["doc/scapy.1.gz"])],