projects
/
python-bulletml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integration and coverage tests. (Fixes issue #2)
[python-bulletml.git]
/
bulletml
/
parser.py
diff --git
a/bulletml/parser.py
b/bulletml/parser.py
index
86dfe3c
..
5435925
100644
(file)
--- a/
bulletml/parser.py
+++ b/
bulletml/parser.py
@@
-13,6
+13,12
@@
import math
from xml.etree.ElementTree import ElementTree
from xml.etree.ElementTree import ElementTree
+# Python 3 moved this for no really good reason.
+try:
+ from sys import intern
+except ImportError:
+ pass
+
try:
from io import StringIO
except ImportError:
try:
from io import StringIO
except ImportError:
@@
-64,7
+70,7
@@
class Direction(object):
def __init__(self, type, value):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
def __init__(self, type, value):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
- self.type =
type
+ self.type =
intern(type)
self.value = value
def __getstate__(self):
self.value = value
def __getstate__(self):
@@
-132,7
+138,7
@@
class Speed(object):
def __init__(self, type, value):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
def __init__(self, type, value):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
- self.type =
type
+ self.type =
intern(type)
self.value = value
def __getstate__(self):
self.value = value
def __getstate__(self):
@@
-355,9
+361,6
@@
class Accel(object):
class BulletDef(object):
"""Bullet definition."""
class BulletDef(object):
"""Bullet definition."""
- direction = None
- speed = None
-
def __init__(self, actions=(), direction=None, speed=None, tags=()):
self.direction = direction
self.speed = speed
def __init__(self, actions=(), direction=None, speed=None, tags=()):
self.direction = direction
self.speed = speed
@@
-537,7
+540,7
@@
class Offset(object):
def __init__(self, type, x, y):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
def __init__(self, type, x, y):
if type not in self.VALID_TYPES:
raise ValueError("invalid type %r" % type)
- self.type =
type
+ self.type =
intern(type)
self.x = x
self.y = y
self.x = x
self.y = y
@@
-551,7
+554,9
@@
class Offset(object):
def __setstate__(self, state):
state = dict(state)
def __setstate__(self, state):
state = dict(state)
- self.__init__(state["type"], state.get("x"), state.get("y"))
+ x = NumberDef(state["x"]) if "x" in state else None
+ y = NumberDef(state["y"]) if "y" in state else None
+ self.__init__(state["type"], x, y)
@classmethod
def FromXML(cls, doc, element):
@classmethod
def FromXML(cls, doc, element):
@@
-706,7
+711,7
@@
class BulletML(object):
)
def __init__(self, type="none", actions=None):
)
def __init__(self, type="none", actions=None):
- self.type =
type
+ self.type =
intern(type)
self.actions = [] if actions is None else actions
def __getstate__(self):
self.actions = [] if actions is None else actions
def __getstate__(self):