starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-27 16:30:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[#5155] - replaces instances of isinstance(x, str) with isinstance(x, six.string_types)

Browse Source
This commit is contained in:
mvi
2017-10-26 19:13:25 +02:00
parent e2ab940ac0
commit 19a4e6079e
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/cli.py
+5 -5
View File
@@ -142,14 +142,14 @@ def report_config_interaction(modified, modifiers):
between config options.
:param modified: config options that can be modified by modifiers
:type modified: iterable or str
:type modified: iterable or str (string_types)
:param modifiers: config options that modify modified
:type modifiers: iterable or str
:type modifiers: iterable or str (string_types)
"""
if isinstance(modified, str):
if isinstance(modified, six.string_types):
modified = (modified,)
if isinstance(modifiers, str):
if isinstance(modifiers, six.string_types):
modifiers = (modifiers,)
for var in modified:
@@ -477,7 +477,7 @@ class HelpfulArgumentParser(object):
if isinstance(help1, bool) and isinstance(help2, bool):
self.help_arg = help1 or help2
else:
self.help_arg = help1 if isinstance(help1, str) else help2
self.help_arg = help1 if isinstance(help1, six.string_types) else help2
short_usage = self._usage_string(plugins, self.help_arg)