Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

generate_secrets: Fix mypy errors. 

I'm pretty sure these errors reflect a problem with Typeshed, but
don't have time to investigate.
This commit is contained in:
Tim Abbott 2017-05-16 23:28:42 -07:00
parent 45a4aeac64
commit b01ba5f389
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/setup/generate_secrets.py
View File

@ -7,7 +7,7 @@ import os
import os.path import os.path
from os.path import dirname, abspath from os.path import dirname, abspath
if False: if False:
from typing import Dict, Optional, Text from typing import Dict, List, Optional, Text
BASE_DIR = dirname(dirname(dirname(abspath(__file__)))) BASE_DIR = dirname(dirname(dirname(abspath(__file__))))
sys.path.append(BASE_DIR) sys.path.append(BASE_DIR)
@ -58,8 +58,8 @@ def get_old_conf(output_filename):
if not os.path.exists(output_filename): if not os.path.exists(output_filename):
return {} return {}
secrets_file = six.moves.configparser.RawConfigParser() # type: ignore # https://github.com/python/typeshed/issues/307 secrets_file = six.moves.configparser.RawConfigParser()
secrets_file.read(output_filename) secrets_file.read(output_filename) # type: ignore
return dict(secrets_file.items("secrets")) return dict(secrets_file.items("secrets"))
@ -71,16 +71,16 @@ def generate_secrets(development=False):
OUTPUT_SETTINGS_FILENAME = "/etc/zulip/zulip-secrets.conf" OUTPUT_SETTINGS_FILENAME = "/etc/zulip/zulip-secrets.conf"
current_conf = get_old_conf(OUTPUT_SETTINGS_FILENAME) current_conf = get_old_conf(OUTPUT_SETTINGS_FILENAME)
lines = [] lines = [] # type: List[Text]
if len(current_conf) == 0: if len(current_conf) == 0:
lines = [u'[secrets]\n'] lines = [u'[secrets]\n']
def need_secret(name): def need_secret(name):
# type: (Text) -> bool # type: (str) -> bool
return name not in current_conf return name not in current_conf
def add_secret(name, value): def add_secret(name, value):
# type: (Text, Text) -> None # type: (str, Text) -> None
lines.append("%s = %s\n" % (name, value)) lines.append("%s = %s\n" % (name, value))
current_conf[name] = value current_conf[name] = value