Merge remote-tracking branch 'origin/dev'

sickbeard/helpers.py

@@ -702,7 +702,7 @@ def get_absolute_number_from_season_and_episode(show, season, episode):
 
 def get_all_episodes_from_absolute_number(show, indexer_id, absolute_numbers):
     if len(absolute_numbers) == 0:
-        raise EpisodeNotFoundByAbsoluteNumberException()
+        raise EpisodeNotFoundByAbsoluteNumberException
 
     episodes = []
     season = None
@@ -718,7 +718,7 @@ def get_all_episodes_from_absolute_number(show, indexer_id, absolute_numbers):
         if ep:
             episodes.append(ep.episode)
         else:
-            raise EpisodeNotFoundByAbsoluteNumberException()
+            raise EpisodeNotFoundByAbsoluteNumberException
         season = ep.season  # this will always take the last found seson so eps that cross the season border are not handeled well
 
     return (season, episodes)

sickbeard/name_parser/parser.py

@@ -15,10 +15,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
-from collections import OrderedDict
 
 import re
-import time
 import datetime
 import os.path
 import threading
@@ -27,7 +25,6 @@ import sickbeard
 
 from sickbeard import logger, helpers, scene_numbering, common
 from dateutil import parser
-from sickbeard.common import cpu_presets
 
 nameparser_lock = threading.Lock()
 
@@ -140,7 +137,7 @@ class NameParser(object):
         elif self.showObj and not self.showObj.is_anime and not self.showObj.is_sports:
             regexMode = self.NORMAL_REGEX
 
-        self.compiled_regexes = OrderedDict()
+        self.compiled_regexes = {}
         self._compile_regexes(regexMode)
 
         matches = []