Use defensive programming

getnikola · Aug 31, 2015 · bfe8186 · bfe8186
1 parent ca78c3b
commit bfe8186
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/nikola/plugins/command/import_wordpress.py b/nikola/plugins/command/import_wordpress.py
@@ -337,8 +337,11 @@ def show_info_about_mising_module(modulename):
         # Add tag redirects
         for tag in self.all_tags:
             try:
-                tag_str = tag.decode('utf8')
-            except (AttributeError, UnicodeEncodeError):
+                if isinstance(tag, utils.bytes_str):
+                    tag_str = tag.decode('utf8', 'replace')
+                else:
+                    tag_str = tag
+            except AttributeError:
                 tag_str = tag
             tag = utils.slugify(tag_str)
             src_url = '{}tag/{}'.format(self.context['SITE_URL'], tag)
@@ -760,8 +763,12 @@ def import_postpage_item(self, item, wordpress_namespace, out_folder=None, attac
         path = unquote(parsed.path.strip('/'))
 
         try:
-            path = path.decode('utf8')
-        except (AttributeError, UnicodeEncodeError):
+            if isinstance(path, utils.bytes_str):
+                path = path.decode('utf8', 'replace')
+            else:
+                path = path
+        except AttributeError:
+            pdb.set_trace()
             pass
 
         # Cut out the base directory.