Fix after rebase

cookbook/helper/recipe_url_import.py

@@ -15,8 +15,8 @@ def get_from_scraper(scrape, space):
 
     recipe_json = {}
     try:
-        recipe_json['name'] = scrape.title()
-    except TypeError:
+        recipe_json['name'] = parse_name(scrape.title() or scrape.schema.data.get('name') or '')
+    except (TypeError, AttributeError):
         recipe_json['name'] = ''
 
     try:

cookbook/helper/scrapers/cooksillustrated.py

@@ -46,11 +46,12 @@ class CooksIllustrated(AbstractScraper):
     def instructions(self):
         if not self.recipe:
             self.get_recipe()
-        return "\n".join([self.recipe['whyThisWorks']] +
-                    [
-                        instruction['fields']['content']
-                        for instruction in self.recipe['instructions']
-                    ]
+        return "\n".join(
+            [self.recipe['whyThisWorks']]
+            + [
+                instruction['fields']['content']
+                for instruction in self.recipe['instructions']
+            ]
         )
 
     def nutrients(self):