Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

PR #1180

Created 16 days agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

32 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

# ... PR #1180 ...

# ... stdlib ...

def _ensure_stringlike(self, option, what, default=None):

val = getattr(self, option)

if val is None:

setattr(self, option, default)

return default

elif not isinstance(val, string_types):

elif not isinstance(val, str):

raise DistutilsOptionError("'%s' must be a %s (got `%s`)"

% (option, what, val))

return val

def ensure_string_list(self, option):

r"""Ensure that 'option' is a list of strings. If 'option' is

currently a string, we split it either on /,\s*/ or /\s+/, so

"foo bar baz", "foo,bar,baz", and "foo, bar baz" all become

["foo", "bar", "baz"].

"""

val = getattr(self, option)

if val is None:

return

elif isinstance(val, string_types):

elif isinstance(val, str):

setattr(self, option, re.split(r',\s*|\s+', val))

else:

if isinstance(val, list):

ok = all(isinstance(v, string_types) for v in val)

ok = all(isinstance(v, str) for v in val)

else:

ok = False

if not ok:

raise DistutilsOptionError(

"'%s' must be a list of strings (got %r)"

% (option, val))

Saved diffs

Original text

Open file

# ... PR #1180 ...

def _ensure_stringlike(self, option, what, default=None):
        val = getattr(self, option)
        if val is None:
            setattr(self, option, default)
            return default
        elif not isinstance(val, string_types):
            raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
                                       % (option, what, val))
        return val

def ensure_string_list(self, option):
        r"""Ensure that 'option' is a list of strings.  If 'option' is
        currently a string, we split it either on /,\s*/ or /\s+/, so
        "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
        ["foo", "bar", "baz"].
        """
        val = getattr(self, option)
        if val is None:
            return
        elif isinstance(val, string_types):
            setattr(self, option, re.split(r',\s*|\s+', val))
        else:
            if isinstance(val, list):
                ok = all(isinstance(v, string_types) for v in val)
            else:
                ok = False
            if not ok:
                raise DistutilsOptionError(
                      "'%s' must be a list of strings (got %r)"
                      % (option, val))

Changed text

Open file

# ... stdlib ...

def _ensure_stringlike(self, option, what, default=None):
        val = getattr(self, option)
        if val is None:
            setattr(self, option, default)
            return default
        elif not isinstance(val, str):
            raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
                                       % (option, what, val))
        return val

def ensure_string_list(self, option):
        r"""Ensure that 'option' is a list of strings.  If 'option' is
        currently a string, we split it either on /,\s*/ or /\s+/, so
        "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
        ["foo", "bar", "baz"].
        """
        val = getattr(self, option)
        if val is None:
            return
        elif isinstance(val, str):
            setattr(self, option, re.split(r',\s*|\s+', val))
        else:
            if isinstance(val, list):
                ok = all(isinstance(v, str) for v in val)
            else:
                ok = False
            if not ok:
                raise DistutilsOptionError(
                      "'%s' must be a list of strings (got %r)"
                      % (option, val))