diff --git a/pyogp/lib/base/data/__init__.py b/pyogp/lib/base/data/__init__.py index e063584..b5953a5 100644 --- a/pyogp/lib/base/data/__init__.py +++ b/pyogp/lib/base/data/__init__.py @@ -1,3 +1,3 @@ -from pkg_resources import resource_string +from pkg_resources import resource_stream -msg_tmpl = resource_string(__name__, 'message_template.msg') +msg_tmpl = resource_stream(__name__, 'message_template.msg') diff --git a/pyogp/lib/base/makepacketbody.py b/pyogp/lib/base/makepacketbody.py index 60698bd..2788d63 100644 --- a/pyogp/lib/base/makepacketbody.py +++ b/pyogp/lib/base/makepacketbody.py @@ -1,11 +1,13 @@ import re import packet import pprint +from pyogp.lib.base.data import msg_tmpl def parse_packets(): dic = {} count = 0 - lines = open(msg_tmpl, ).xreadlines() + msg_tmpl.seek(0) + lines = msg_tmpl #results = re.match("^\t([^\t{}]+.+)",line) #gets packet headers #results = re.match("^\t\t([^{}]+.+)",line) #gets packet blocks #results = re.match("^\t\t([{}]+.+)",line) #gets block data @@ -14,10 +16,14 @@ def parse_packets(): current_block = None current_var = None + print lines + #we have to go through all the packets and parse them while(True): try: line = lines.next() + #print line + #raw_input() except StopIteration: break @@ -58,27 +64,26 @@ def print_packet_list(packet_list): for block in packet_list[packet].blocks: print '\t' + block.name - for var in block.vars: - print '\t\t' + var #var.name + ' ' + var.lltype + for varname in block.vars: + print '\t\t' + varname + '\t' + block.vars[varname] def get_all_types(packet_list): type_set = set([]) for packet in packet_list: for block in packet_list[packet].blocks: - for var in block.vars.keys(): - #print var - type_set.add(var)#var.lltype) + for varname in block.vars: + type_set.add(block.vars[varname]) type_list = list(type_set) type_list.sort() return type_list def main(): - #p_list = parse_packets() + p_list = parse_packets() #print_packet_list(p_list) - #p_typelist = get_all_types(p_list) - #pprint.pprint(p_typelist) + p_typelist = get_all_types(p_list) + pprint.pprint(p_typelist) return if __name__ == "__main__": diff --git a/pyogp/lib/base/makepacketdict.py b/pyogp/lib/base/makepacketdict.py index 9697b40..ed31edd 100644 --- a/pyogp/lib/base/makepacketdict.py +++ b/pyogp/lib/base/makepacketdict.py @@ -24,13 +24,12 @@ $/LicenseInfo$ """ import re -import sys -print sys.path from pyogp.lib.base.data import msg_tmpl def makereversepacketdict(): rev_dict = {} - for line in open(msg_tmpl, ).xreadlines(): + msg_tmpl.seek(0) + for line in msg_tmpl: results = re.match("^\t([^\t{}]+.+)",line) if results: aline = results.group(1) @@ -45,9 +44,8 @@ def makereversepacketdict(): def makepacketdict(): dict = {} - raw_input() - for line in open(msg_tmpl, ).xreadlines(): - raw_input() + msg_tmpl.seek(0) + for line in msg_tmpl: results = re.match("^\t([^\t{}]+.+)",line) if results: aline = results.group(1) diff --git a/pyogp/lib/base/packet.py b/pyogp/lib/base/packet.py index 3e1b648..027e609 100644 --- a/pyogp/lib/base/packet.py +++ b/pyogp/lib/base/packet.py @@ -60,7 +60,7 @@ class PacketBlock(): #self.vars.append(var) def addVar(self, name, typename): - self.vars[name] = tp + self.vars[name] = typename def getVar(self, index): return self.vars[index] diff --git a/setup.py b/setup.py index 53e9387..2bcda9d 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,8 @@ setup(name='pyogp.lib.base', entry_points={ 'console_scripts': [ 'login = pyogp.lib.base.example:main', - 'OGPlogin = pyogp.lib.base.OGPLogin:main' + 'OGPlogin = pyogp.lib.base.OGPLogin:main', + 'packets = pyogp.lib.base.makepacketbody:main' ], },