diff options
author | Georgy Frolov <gosha@fro.lv> | 2021-03-11 08:24:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-11 08:24:13 +0300 |
commit | e009995e9f890cb75e8d60fa62166a1baeccb809 (patch) | |
tree | f79b1a10130708ff106f149b26eb40099b565aa0 | |
parent | 8aa3f92666241692c0fe75832c62aebca5c6b865 (diff) | |
parent | b1bdfa6a43361884392252ab0238d5b11ec9effb (diff) |
Merge pull request #1258 from ERYoung11/fix_test_main_windows_error
skipping initial comments in pgconfig file did not work on Windows.
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | pgcli/main.py | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -116,6 +116,7 @@ Contributors: * Kevin Marsh (kevinmarsh) * Eero Ruohola (ruohola) * Miroslav Šedivý (eumiro) + * Eric R Young (ERYoung11) Creator: -------- diff --git a/pgcli/main.py b/pgcli/main.py index ea58535f..11dbc322 100644 --- a/pgcli/main.py +++ b/pgcli/main.py @@ -21,7 +21,6 @@ import datetime as dt import itertools import platform from time import time, sleep -from codecs import open keyring = None # keyring will be loaded later @@ -1517,7 +1516,7 @@ def parse_service_info(service): if not service or not os.path.exists(service_file): # nothing to do return None, service_file - with open(service_file) as f: + with open(service_file, newline="") as f: skipped_lines = skip_initial_comment(f) try: service_file_config = ConfigObj(f) |