- assignSetInfo.py now compatible with Python 2.6

- Fixing far_away.txt filename

.gitattributes

@@ -3530,7 +3530,7 @@ res/cardsfolder/f/fangren_hunter.txt svneol=native#text/plain
 res/cardsfolder/f/fangren_marauder.txt svneol=native#text/plain
 res/cardsfolder/f/fangren_pathcutter.txt svneol=native#text/plain
 res/cardsfolder/f/fanning_the_flames.txt svneol=native#text/plain
-res/cardsfolder/f/far_away[!!-~].txt -text
+res/cardsfolder/f/far_away.txt -text
 res/cardsfolder/f/far_wanderings.txt svneol=native#text/plain
 res/cardsfolder/f/farbog_boneflinger.txt -text
 res/cardsfolder/f/farbog_explorer.txt -text

res/blockdata/formats.txt

@@ -1,5 +1,5 @@
-Name:Standard|Index:1|Sets:ISD, DKA, AVR, M13, RTR, GTC
+Name:Standard|Index:1|Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM
-Name:Extended|Index:2|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep
+Name:Extended|Index:2|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep
-Name:Modern|Index:3|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl
+Name:Modern|Index:3|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl
 Name:Legacy|Index:4|Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Lotus; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Falling Star; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will; Mental Misstep
 Name:Vintage|Index:5|Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends

res/cardsfolder/f/far_away.txt

@@ -5,7 +5,9 @@ Types:Instant
 K:Fuse
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/far_away.jpg
+
 ALTERNATE
+
 Name:Away
 ManaCost:2 B
 Types:Instant

tools/assignSetInfo.py

@@ -11,7 +11,7 @@ class cis:      # CardInSet
 		self.arts = 0
 
 	def __str__(self):
-		return self.rarityFull() if self.arts <= 1 else "{} x{}".format(self.rarityFull(), self.arts)
+		return self.rarityFull() if self.arts <= 1 else "{0} x{1}".format(self.rarityFull(), self.arts)
 
 	def __repr__(self):
 		return self.__str__()
@@ -81,11 +81,14 @@ if __name__ == '__main__':
 					editions = {}
 					for i in range(len(sets)):
 						ee = sets[i].split(' ')
+
 						setName = ee[0]
 						if not setName in editions:
 							editions[setName] = cis()
+
 						editions[setName].rarity = ee[1].strip()
 						prints = int(ee[2][2:3]) if len(ee) > 2 else 1
+
 						editions[setName].arts += prints
 					#print sets
 					mtgDataCards[tmpName] = editions
@@ -142,8 +145,8 @@ if __name__ == '__main__':
 				cardName = altName
 
 			for e in mtgDataCards[cardName]:
-				if not setCodeToForge[e] is None:
+				if setCodeToForge[e] is not None:
-					validLines.append( "SetInfo:{} {}".format(setCodeToForge[e], mtgDataCards[cardName][e]) )
+					validLines.append( "SetInfo:{0} {1}".format(setCodeToForge[e], mtgDataCards[cardName][e]))
 
 			if previousLines == validLines:
 				continue