From 8ca141852d5c39f32bc415e5ab8c98b6430ffbe7 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <nikolaus.waxweiler@daltonmaag.com>
Date: Mon, 23 Nov 2020 14:32:45 +0000
Subject: [PATCH] UFOReader: always expect contents.plist

---
 Lib/fontTools/ufoLib/__init__.py | 14 ++------------
 Tests/ufoLib/UFO3_test.py        |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Lib/fontTools/ufoLib/__init__.py b/Lib/fontTools/ufoLib/__init__.py
index 9a6113dc6..e846d085d 100755
--- a/Lib/fontTools/ufoLib/__init__.py
+++ b/Lib/fontTools/ufoLib/__init__.py
@@ -683,13 +683,7 @@ class UFOReader(_UFOBaseIO):
 		# this will already have been raised during __init__
 		raise UFOLibError("The default layer is not defined in layercontents.plist.")
 
-	def getGlyphSet(
-		self,
-		layerName=None,
-		validateRead=None,
-		validateWrite=None,
-		expectContentsFile=False
-	):
+	def getGlyphSet(self, layerName=None, validateRead=None, validateWrite=None):
 		"""
 		Return the GlyphSet associated with the
 		glyphs directory mapped to layerName
@@ -701,10 +695,6 @@ class UFOReader(_UFOBaseIO):
 		class's validate value, can be overridden.
 		``validateWrite`` will validate the written data, by default it is set to the
 		class's validate value, can be overridden.
-		``expectContentsFile`` will raise a GlifLibError if a contents.plist file is
-		not found on the glyph set file system. This should be set to ``True`` if you
-		are reading an existing UFO and ``False`` if you use ``getGlyphSet`` to create
-		a fresh	glyph set.
 		"""
 		from fontTools.ufoLib.glifLib import GlyphSet
 
@@ -733,7 +723,7 @@ class UFOReader(_UFOBaseIO):
 			ufoFormatVersion=self._formatVersion,
 			validateRead=validateRead,
 			validateWrite=validateWrite,
-			expectContentsFile=expectContentsFile
+			expectContentsFile=True
 		)
 
 	def getCharacterMapping(self, layerName=None, validate=None):
diff --git a/Tests/ufoLib/UFO3_test.py b/Tests/ufoLib/UFO3_test.py
index 8a146b754..c4218023b 100644
--- a/Tests/ufoLib/UFO3_test.py
+++ b/Tests/ufoLib/UFO3_test.py
@@ -3946,7 +3946,7 @@ class UFO3WriteLayersTestCase(unittest.TestCase):
 
 		reader = UFOReader(self.ufoPath, validate=True)
 		with self.assertRaises(GlifLibError):
-			reader.getGlyphSet("layer 1", expectContentsFile=True)
+			reader.getGlyphSet("layer 1")
 
 		writer = UFOWriter(self.ufoPath, validate=True)
 		with self.assertRaises(GlifLibError):