Minor code cleanups

hearthstone/cardxml.py

@@ -112,7 +112,7 @@ def from_xml(cls, xml):
 				self.hero_power = t[0].attrib.get("cardID")
 
 		e = xml.findall("MasterPower")
-		self.master_power = e and e[0].text or None
+		self.master_power = e[0] if e else None
 
 		e = xml.findall("Power")
 		for power in e:

hearthstone/dbf.py

@@ -47,15 +47,15 @@ def _deserialize_value(self, element, coltype):
 		raise NotImplementedError("Unknown DBF Data Type: %r" % (coltype))
 
 	def populate(self, file):
-		self._xml = ElementTree.parse(file)
-		self.name = self._xml.getroot().attrib.get("name", "")
-		for fingerprint in self._xml.findall("SourceFingerprint"):
+		_xml = ElementTree.parse(file)
+		self.name = _xml.getroot().attrib.get("name", "")
+		for fingerprint in _xml.findall("SourceFingerprint"):
 			self.source_fingerprint = fingerprint.text
 
-		for column in self._xml.findall("Column"):
+		for column in _xml.findall("Column"):
 			self.columns[column.attrib["name"]] = column.attrib["type"]
 
-		self.records = [self._deserialize_record(e) for e in self._xml.findall("Record")]
+		self.records = [self._deserialize_record(e) for e in _xml.findall("Record")]
 
 	def object_to_xml_column_name(self, name):
 		if name.startswith("m_"):

hearthstone/enums.py

@@ -1355,10 +1355,10 @@ def as_of_date(self, date=None):
 
 
 if __name__ == "__main__":
-	import sys
 	import json
+	import sys
 
-	enums = {
+	all_enums = {
 		k: dict(v.__members__) for k, v in globals().items() if (
 			isinstance(v, type) and issubclass(v, IntEnum) and k != "IntEnum"
 		)
@@ -1379,8 +1379,8 @@ def _print_enums(enums, format):
 		format = "--json"
 
 	if format == "--ts":
-		_print_enums(enums, "export const enum %s {\n%s\n}")
+		_print_enums(all_enums, "export const enum %s {\n%s\n}")
 	elif format == "--cs":
-		_print_enums(enums, "public enum %s {\n%s\n}")
+		_print_enums(all_enums, "public enum %s {\n%s\n}")
 	else:
-		print(json.dumps(enums, sort_keys=True))
+		print(json.dumps(all_enums, sort_keys=True))