Skip to content

Commit db565b4

Browse files
committed
Adds module imports to the packages which cleans up the import paths for the various different internal classes
1 parent 57af106 commit db565b4

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

objects/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from bytestream import ByteStream
2+
from message import Message
3+
from attribute import Attribute
4+
from player import Player
File renamed without changes.

parsers/__init__.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from eventParsers import EventParser,EventParser_16561
2+
from detailParsers import DetailParser
3+
from messageParsers import MessageParser
4+
from attributeParsers import AttributeParser
5+
6+
7+
def getDetailParser(build):
8+
return DetailParser()
9+
10+
def getAttributeParser(build):
11+
return AttributeParser()
12+
13+
def getEventParser(build):
14+
if build >= 16561:
15+
return EventParser_16561()
16+
else:
17+
return EventParser()
18+
19+
def getMessageParser(build):
20+
return MessageParser()

parsers/attributeParsers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from collections import defaultdict
22

3-
from objects.attribute import Attribute
4-
from objects.bytestream import ByteStream
3+
from objects import Attribute,ByteStream
54

65
class AttributeParser(object):
76
def load(self,replay,filecontents):

parsers/detailParsers.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from time import ctime
22

3-
from objects.player import Player
4-
from objects.bytestream import ByteStream
5-
3+
from objects import ByteStream,Player
64

75
class DetailParser(object):
86
def load(self,replay,filecontents):

parsers/eventParsers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from objects.event import *
2-
from objects.bytestream import ByteStream
1+
from objects.events import *
2+
from objects import ByteStream
33

44

55
class EventParser(object):

parsers/messageParsers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from objects.bytestream import ByteStream
2-
from objects.message import Message
1+
from objects import ByteStream,Message
32

43
class MessageParser(object):
54
def load(self,replay,filecontents):

parsers/parserLookup.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

replay.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from mpyq import MPQArchive
55

6-
from parsers import parserLookup
7-
from objects.bytestream import ByteStream
6+
import parsers
7+
from objects import ByteStream
88

99

1010
class Replay(object):
@@ -55,16 +55,16 @@ def parseMPQArchive(self,archive):
5555
attributesFile = files['replay.attributes.events']
5656

5757
#Load the details file first to get player information
58-
parserLookup.getDetailParser(self.build).load(self,detailsFile)
58+
parsers.getDetailParser(self.build).load(self,detailsFile)
5959

6060
#Next load the attributes file to fill out players and get team information
61-
parserLookup.getAttributeParser(self.build).load(self,attributesFile)
61+
parsers.getAttributeParser(self.build).load(self,attributesFile)
6262

6363
#Finally load the events file to get gameplay data and APM
64-
parserLookup.getEventParser(self.build).load(self,eventsFile)
64+
parsers.getEventParser(self.build).load(self,eventsFile)
6565

6666
#We'll also load up the messages for a peak at what was going on
67-
parserLookup.getMessageParser(self.build).load(self,messageFile)
67+
parsers.getMessageParser(self.build).load(self,messageFile)
6868

6969
def setDerivedValues(self):
7070
self.teams = defaultdict(list)

0 commit comments

Comments
 (0)