glossary_v2.py: a few more minor cleanup

ilius · Dec 31, 2024 · d4530f1 · d4530f1
1 parent 6ca6890
commit d4530f1
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/pyglossary/glossary_v2.py b/pyglossary/glossary_v2.py
@@ -1162,11 +1162,10 @@ def _convertPrepare(
 
 		outputPlugin = self.plugins[outputFormat]
 
-		sortParams = self._resolveSortParams(
+		direct, sort = self._resolveSortParams(
 			args=args,
 			plugin=outputPlugin,
 		)
-		direct, sort = sortParams
 
 		showMemoryUsage()
 
@@ -1206,14 +1205,11 @@ def convertV2(self, args: ConvertArgs) -> str:
 
 		tm0 = now()
 
-		outputArgs = self.detectOutputFormat(
+		outputFilename, outputFormat, compression = self.detectOutputFormat(
 			filename=args.outputFilename,
 			formatName=args.outputFormat,
 			inputFilename=args.inputFilename,
 		)
-		if not outputArgs:
-			raise Error(f"Writing file {relpath(args.outputFilename)!r} failed.")
-		outputFilename, outputFormat, compression = outputArgs
 
 		sort = self._convertPrepare(
 			args=args,