From 466327006721b43c75fbb1a7bc5f39f0860b2ff6 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sat, 12 Sep 2015 11:02:32 -0400
Subject: [PATCH] Since we now have a list of skills by default on our
 character, remove the iterSkills iterator which helped fetch skills that were
 not previously loaded

---
 eos/saveddata/character.py | 21 +++++++++++----------
 eos/saveddata/fleet.py     |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index 40c7dfacf..051fdb7c8 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -120,6 +120,10 @@ class Character(object):
     def owner(self, owner):
         self.__owner = owner
 
+    @property
+    def skills(self):
+        return self.__skills
+
     def addSkill(self, skill):
         self.__skills.append(skill)
         self.__skillIdMap[skill.itemID] = skill
@@ -150,40 +154,37 @@ class Character(object):
     def isDirty(self):
         return getattr(self, "dirty", False)
 
-    def iterSkills(self):
-        for item in self.getSkillList():
-            yield self.getSkill(item)
-
     def filteredSkillIncrease(self, filter, *args, **kwargs):
-        for element in self.iterSkills():
+        for element in self.skills:
             if filter(element):
                 element.increaseItemAttr(*args, **kwargs)
 
     def filteredSkillMultiply(self, filter, *args, **kwargs):
-        for element in self.iterSkills():
+        for element in self.skills:
             if filter(element):
                 element.multiplyItemAttr(*args, **kwargs)
 
     def filteredSkillBoost(self, filter, *args, **kwargs):
-        for element in self.iterSkills():
+        for element in self.skills:
             if filter(element):
                 element.boostItemAttr(*args, **kwargs)
 
     def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
         if forceProjected: return
-        for skill in self.iterSkills():
+        for skill in self.skills:
             fit.register(skill)
             skill.calculateModifiedAttributes(fit, runTime)
 
     def clear(self):
-        for skill in self.iterSkills():
+        for skill in self.skills:
             skill.clear()
 
     def __deepcopy__(self, memo):
         copy = Character("%s copy" % self.name)
         copy.apiKey = self.apiKey
         copy.apiID = self.apiID
-        for skill in self.iterSkills():
+
+        for skill in self.skills:
             copy.addSkill(Skill(skill.itemID, skill.level, False, skill.learned))
 
         return copy
diff --git a/eos/saveddata/fleet.py b/eos/saveddata/fleet.py
index f1445ae3a..c1db0e97e 100644
--- a/eos/saveddata/fleet.py
+++ b/eos/saveddata/fleet.py
@@ -247,7 +247,7 @@ class Store(object):
             dict.clear()
 
         # Go through everything which can be used as gang booster
-        for thing in chain(fitBooster.modules, fitBooster.implants, fitBooster.character.iterSkills(), (fitBooster.ship,)):
+        for thing in chain(fitBooster.modules, fitBooster.implants, fitBooster.character.skills, (fitBooster.ship,)):
             if thing.item is None:
                 continue
             for effect in thing.item.effects.itervalues():