Changeset 893:28f0720f809f

Show
Ignore:
Timestamp:
08/31/08 00:32:40 (4 months ago)
Author:
Phil <phil@secdev.org>
Message:

Fix imports

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scapy/arch/__init__.py

    r885 r893  
    55 
    66 
    7 import sys,os,struct,socket,time 
    8 from fcntl import ioctl 
     7import sys,os,socket 
    98from scapy.error import * 
    109import scapy.config 

  • scapy/as_resolvers.py

    r862 r893  
    44## This program is published under a GPLv2 license 
    55 
     6import socket 
    67from config import conf 
    78 

  • scapy/asn1/ber.py

    r876 r893  
    55 
    66from scapy.error import warning 
     7from scapy.utils import inet_aton,inet_ntoa 
    78from asn1 import ASN1_Decoding_Error,ASN1_Encoding_Error,ASN1_BadTag_Decoding_Error,ASN1_Codecs,ASN1_Class_UNIVERSAL,ASN1_Error,ASN1_DECODING_ERROR,ASN1_BADTAG 
    89 

  • scapy/main.py

    r886 r893  
    8484def interact(mydict=None,argv=None,mybanner=None,loglevel=20): 
    8585    global session 
    86     import code,sys,cPickle,os,imp,getopt,logging,re 
     86    import code,sys,cPickle,os,getopt,re 
    8787    from config import conf 
    8888    conf.interactive = True 

  • scapy/packet.py

    r892 r893  
    44## This program is published under a GPLv2 license 
    55 
    6 import re,time,itertools,os,random,socket 
    7 from fields import StrField,ConditionalField,Emph 
     6import time,itertools,os 
     7from fields import StrField,ConditionalField,Emph,PacketListField 
    88from config import conf 
    99from base_classes import BasePacket,Gen,SetGen,Packet_metaclass,NewDefaultValues 
    1010from volatile import VolatileValue 
     11from utils import import_hexcap,tex_escape,colgen 
     12from error import Scapy_Exception,log_runtime 
     13 
     14try: 
     15    import pyx 
     16except ImportError: 
     17    pass 
    1118 
    1219 

  • scapy/plist.py

    r892 r893  
    44## This program is published under a GPLv2 license 
    55 
    6 import os,socket 
     6import os 
    77from config import conf 
    8 from error import warning 
    98from base_classes import BasePacket,BasePacketList 
    109from packet import Padding 
    1110 
    12 from utils import incremental_label,colgen,do_graph,hexdump,make_table,make_lined_table,make_tex_table 
     11from utils import do_graph,hexdump,make_table,make_lined_table,make_tex_table 
    1312 
    1413import arch 

  • scapy/supersocket.py

    r892 r893  
    44## This program is published under a GPLv2 license 
    55 
    6 import socket,time,os,struct 
    7 from select import select 
     6import socket,time 
    87from config import conf 
    98from data import * 

  • scapy/tools/UTscapy.py

    r846 r893  
    66 
    77import sys,getopt,imp 
    8 import bz2, base64, os, os.path, time, imp, traceback, zlib, sha 
     8import bz2, base64, os.path, time, traceback, zlib, sha 
    99 
    1010 

  • scapy/tools/check_asdis.py

    r873 r893  
    22 
    33import getopt 
    4 import gzip,struct 
    54 
    65def usage(): 
    …… 
    4746     
    4847 
    49     from scapy.config import conf,Num2Layer 
     48    from scapy.config import conf 
    5049    from scapy.utils import RawPcapReader,RawPcapWriter,hexdiff 
    5150    from scapy.layers import all 

  • scapy/utils.py

    r892 r893  
    66import os,sys,socket,types 
    77from config import conf 
    8 import random 
     8from data import MTU 
     9import random,time 
    910import gzip,zlib,cPickle 
    1011import re,struct,array 
    11 from error import log_runtime 
     12from error import log_runtime,log_loading,log_interactive 
    1213from base_classes import BasePacketList 
    1314