Merge branch 'master' into stop-writing-title-twice

twisted · Sep 22, 2021 · b2bcd8c · b2bcd8c
2 parents 0e0f30b + f414111
commit b2bcd8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/towncrier/_settings.py b/src/towncrier/_settings.py
@@ -7,9 +7,10 @@
 import pkg_resources
 
 if sys.version_info >= (3, 6):
-    from tomli import load as _toml_load
+    import tomli
 else:
-    from toml import load as _toml_load
+    tomli = None
+    import toml
 
 from collections import OrderedDict
 
@@ -74,9 +75,12 @@ def load_config(directory):
 
 
 def load_config_from_file(directory, config_file):
-
-    with io.open(config_file, "r", encoding="utf8") as conffile:
-        config = _toml_load(conffile)
+    if tomli:
+        with io.open(config_file, "rb") as conffile:
+            config = tomli.load(conffile)
+    else:
+        with io.open(config_file, "r", encoding="utf8", newline="") as conffile:
+            config = toml.load(conffile)
 
     return parse_toml(directory, config)
 

diff --git a/src/towncrier/newsfragments/359.bugfix.rst b/src/towncrier/newsfragments/359.bugfix.rst
@@ -0,0 +1 @@
+Disable universal newlines when reading TOML