fix for issues #321 and 258

sickbeard/encodingKludge.py

@@ -40,7 +40,6 @@ def fixStupidEncodings(x, silent=False):
             logger.DEBUG if silent else logger.ERROR)
         return None
 
-    return None
 
 
 def fixListEncodings(x):

sickbeard/helpers.py

@@ -971,7 +971,7 @@ def get_show_by_name(name):
         sickbeard.name_cache.addNameToCache(name, indexerid if indexerid else 0)
 
     if indexerid:
-        logger.log(u"Found Indexer ID:[" + repr(indexerid) + "], using that for [" + name + "}",logger.DEBUG)
+        logger.log(u"Found Indexer ID:[" + repr(indexerid) + "], using that for [" + str(name) + "}",logger.DEBUG)
         if not showObj:
             showObjList = [x for x in sickbeard.showList if x.indexerid == indexerid]
             if len(showObjList):

sickbeard/providers/hdtorrents.py

@@ -360,7 +360,7 @@ class HDTorrentsCache(tvcache.TVCache):
         if not title or not url:
             return None
 
-        logger.log(u"Adding item to cache: " + title, logger.DEBUG)
+        logger.log(u"Adding item to cache: " + str(title), logger.DEBUG)
 
         return self._addCacheEntry(title, url)
 

sickbeard/providers/publichd.py

@@ -142,7 +142,7 @@ class PublicHDProvider(generic.TorrentProvider):
                 #remove unneccecary <option> lines which are slowing down BeautifulSoup
                 optreg = re.compile(r'<option.*</option>')
                 html = os.linesep.join([s for s in html.splitlines() if not optreg.search(s)])
-
+    
                 try:
                     soup = BeautifulSoup(html, features=["html5lib", "permissive"])