removing post argument from API

jupyter · Oct 4, 2017 · e4ce2fa · e4ce2fa
1 parent dafb245
commit e4ce2fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/notebook/nbconvert/handlers.py b/notebook/nbconvert/handlers.py
@@ -79,9 +79,13 @@ def get_exporter(format, **kwargs):
 
 class NbconvertFileHandler(IPythonHandler):
 
+<<<<<<< HEAD
     def call_nbconvert(self, format, path, config=None, content=None, post=False):
 
 
+=======
+    def call_nbconvert(self, format, path, config=None, content=None):
+>>>>>>> removing post argument from API
         exporter = get_exporter(format, config=config, log=self.log)
         path = path.strip('/')
         model = self.contents_manager.get(path=path)
@@ -142,7 +146,7 @@ def post(self, format, path):
         json_config = json.loads(json_upload.get("config",{}))
         c.merge(json_config)
         nb_content = json.dumps(json_upload["notebook"])
-        self.call_nbconvert(format, path, config=c, content=nb_content, post=True)
+        self.call_nbconvert(format, path, config=c, content=nb_content)
 
 
 class NbconvertPostHandler(IPythonHandler):