Merge pull request #327 from robotools/instantiate_font_guidelines_wi…

…th_font_self Fix previous PR: Instantiate font guidelines with font self
robotools · Dec 16, 2020 · 148ae12 · 148ae12
2 parents 240804f + 2b724c3
commit 148ae12
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/Lib/defcon/objects/font.py b/Lib/defcon/objects/font.py
@@ -1097,7 +1097,6 @@ def insertGuideline(self, index, guideline):
         """
         if not isinstance(guideline, self._guidelineClass):
             guideline = self.instantiateGuideline(guidelineDict=guideline)
-        assert guideline not in self._guidelines
         assert guideline.font in (self, None), "This guideline belongs to another font."
         self.postNotification(notification="Font.GuidelineWillBeAdded", data=dict(object=guideline))
         if guideline.font is None:

diff --git a/Lib/defcon/test/objects/test_font.py b/Lib/defcon/test/objects/test_font.py
@@ -349,7 +349,6 @@ def test_instantiateGuideline(self):
     def test_beginSelfGuidelineNotificationObservation(self):
         font = Font(getTestFontPath())
         guideline = font.instantiateGuideline()
-        guideline.font = font
         self.assertFalse(guideline.dispatcher.hasObserver(
             font, "Guideline.Changed", guideline))
         font.beginSelfGuidelineNotificationObservation(guideline)
@@ -359,7 +358,6 @@ def test_beginSelfGuidelineNotificationObservation(self):
     def test_endSelfGuidelineNotificationObservation(self):
         font = Font(getTestFontPath())
         guideline = font.instantiateGuideline()
-        guideline.font = font
         font.beginSelfGuidelineNotificationObservation(guideline)
         self.assertTrue(guideline.hasObserver(
             font, "Guideline.Changed"))