Fix multiple problems with the merge. There are still errors, but I will intentionally leave them because future merges might resolve them

2 files changed, 9 insertions, 1 deletions

diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py
index 349640a..dc39607 100644
--- a/gerber/render/cairo_backend.py
+++ b/gerber/render/cairo_backend.py
@@ -21,7 +21,7 @@ except ImportError:
     import cairocffi as cairo

     
 import math

-from operator import mul, di

+from operator import mul, div

 
 import tempfile

 

diff --git a/gerber/render/rs274x_backend.py b/gerber/render/rs274x_backend.py
index 5ab74f0..b4b4612 100644
--- a/gerber/render/rs274x_backend.py
+++ b/gerber/render/rs274x_backend.py
@@ -476,6 +476,14 @@ class Rs274xContext(GerberContext):
     def _render_inverted_layer(self):
         pass
     
+    def _new_render_layer(self):
+        # TODO Might need to implement this
+        pass
+    
+    def _flatten(self):
+        # TODO Might need to implement this
+        pass
+    
     def dump(self):
         """Write the rendered file to a StringIO steam"""
         statements = map(lambda stmt: stmt.to_gerber(self.settings), self.statements)