fix indentation again

This commit is contained in:
Benjamin Peterson 2009-01-31 22:14:21 +00:00
parent e1c3729b8c
commit 29060641ca

View file

@ -236,7 +236,7 @@ Py_LOCAL_INLINE(int) unicode_member(Py_UNICODE chr, Py_UNICODE* set, Py_ssize_t
return 0; return 0;
} }
#define BLOOM_MEMBER(mask, chr, set, setlen)\ #define BLOOM_MEMBER(mask, chr, set, setlen) \
BLOOM(mask, chr) && unicode_member(chr, set, setlen) BLOOM(mask, chr) && unicode_member(chr, set, setlen)
/* --- Unicode Object ----------------------------------------------------- */ /* --- Unicode Object ----------------------------------------------------- */
@ -730,11 +730,11 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
s++; if(!*s)break; s++; if(!*s)break;
s++; s++;
} else { } else {
#ifdef Py_UNICODE_WIDE #ifdef Py_UNICODE_WIDE
n++; n++;
#else #else
n+=2; n+=2;
#endif #endif
s++; if(!*s)break; s++; if(!*s)break;
s++; if(!*s)break; s++; if(!*s)break;
s++; if(!*s)break; s++; if(!*s)break;
@ -1859,7 +1859,7 @@ PyObject *PyUnicode_DecodeUTF7Stateful(const char *s,
Py_XDECREF(exc); Py_XDECREF(exc);
return (PyObject *)unicode; return (PyObject *)unicode;
onError: onError:
Py_XDECREF(errorHandler); Py_XDECREF(errorHandler);
Py_XDECREF(exc); Py_XDECREF(exc);
Py_DECREF(unicode); Py_DECREF(unicode);
@ -2236,7 +2236,7 @@ PyObject *PyUnicode_DecodeUTF8Stateful(const char *s,
Py_XDECREF(exc); Py_XDECREF(exc);
return (PyObject *)unicode; return (PyObject *)unicode;
onError: onError:
Py_XDECREF(errorHandler); Py_XDECREF(errorHandler);
Py_XDECREF(exc); Py_XDECREF(exc);
Py_DECREF(unicode); Py_DECREF(unicode);
@ -2320,7 +2320,7 @@ PyUnicode_EncodeUTF8(const Py_UNICODE *s,
*p++ = (char)(0x80 | (ch & 0x3f)); *p++ = (char)(0x80 | (ch & 0x3f));
continue; continue;
} }
encodeUCS4: encodeUCS4:
/* Encode UCS4 Unicode ordinals */ /* Encode UCS4 Unicode ordinals */
*p++ = (char)(0xf0 | (ch >> 18)); *p++ = (char)(0xf0 | (ch >> 18));
*p++ = (char)(0x80 | ((ch >> 12) & 0x3f)); *p++ = (char)(0x80 | ((ch >> 12) & 0x3f));
@ -2523,7 +2523,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
Py_XDECREF(exc); Py_XDECREF(exc);
return (PyObject *)unicode; return (PyObject *)unicode;
onError: onError:
Py_DECREF(unicode); Py_DECREF(unicode);
Py_XDECREF(errorHandler); Py_XDECREF(errorHandler);
Py_XDECREF(exc); Py_XDECREF(exc);
@ -2646,7 +2646,7 @@ PyUnicode_DecodeUTF16(const char *s,
rare in most input. rare in most input.
FAST_CHAR_MASK is used when the input is in native byte ordering, FAST_CHAR_MASK is used when the input is in native byte ordering,
SWAPPED_FAST_CHAR_MASK when the input is in byteswapped ordering. SWAPPED_FAST_CHAR_MASK when the input is in byteswapped ordering.
*/ */
#if (SIZEOF_LONG == 8) #if (SIZEOF_LONG == 8)
# define FAST_CHAR_MASK 0x8000800080008000L # define FAST_CHAR_MASK 0x8000800080008000L
# define SWAPPED_FAST_CHAR_MASK 0x0080008000800080L # define SWAPPED_FAST_CHAR_MASK 0x0080008000800080L
@ -2916,7 +2916,7 @@ PyUnicode_DecodeUTF16Stateful(const char *s,
Py_XDECREF(exc); Py_XDECREF(exc);
return (PyObject *)unicode; return (PyObject *)unicode;
onError: onError:
Py_DECREF(unicode); Py_DECREF(unicode);
Py_XDECREF(errorHandler); Py_XDECREF(errorHandler);
Py_XDECREF(exc); Py_XDECREF(exc);
@ -3249,7 +3249,7 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s,
Py_XDECREF(exc); Py_XDECREF(exc);
return (PyObject *)v; return (PyObject *)v;
ucnhashError: ucnhashError:
PyErr_SetString( PyErr_SetString(
PyExc_UnicodeError, PyExc_UnicodeError,
"\\N escapes not supported (can't load unicodedata module)" "\\N escapes not supported (can't load unicodedata module)"
@ -3259,7 +3259,7 @@ ucnhashError:
Py_XDECREF(exc); Py_XDECREF(exc);
return NULL; return NULL;
onError: onError:
Py_XDECREF(v); Py_XDECREF(v);
Py_XDECREF(errorHandler); Py_XDECREF(errorHandler);
Py_XDECREF(exc); Py_XDECREF(exc);
@ -3698,9 +3698,9 @@ PyObject *_PyUnicode_DecodeUnicodeInternal(const char *s,
/* We have to sanity check the raw data, otherwise doom looms for /* We have to sanity check the raw data, otherwise doom looms for
some malformed UCS-4 data. */ some malformed UCS-4 data. */
if ( if (
#ifdef Py_UNICODE_WIDE #ifdef Py_UNICODE_WIDE
*p > unimax || *p < 0 || *p > unimax || *p < 0 ||
#endif #endif
end-s < Py_UNICODE_SIZE end-s < Py_UNICODE_SIZE
) )
{ {
@ -4629,9 +4629,9 @@ PyUnicode_BuildEncodingMap(PyObject* string)
for (i = 1; i < 256; i++) { for (i = 1; i < 256; i++) {
int l1, l2; int l1, l2;
if (decode[i] == 0 if (decode[i] == 0
#ifdef Py_UNICODE_WIDE #ifdef Py_UNICODE_WIDE
|| decode[i] > 0xFFFF || decode[i] > 0xFFFF
#endif #endif
) { ) {
need_dict = 1; need_dict = 1;
break; break;
@ -5202,8 +5202,8 @@ int charmaptranslate_lookup(Py_UNICODE c, PyObject *mapping, PyObject **result)
} }
} }
/* ensure that *outobj is at least requiredsize characters long, /* ensure that *outobj is at least requiredsize characters long,
if not reallocate and adjust various state variables. if not reallocate and adjust various state variables.
Return 0 on success, -1 on error */ Return 0 on success, -1 on error */
static static
int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp,
Py_ssize_t requiredsize) Py_ssize_t requiredsize)
@ -6460,7 +6460,7 @@ PyObject *replace(PyUnicodeObject *self,
} }
return (PyObject *) u; return (PyObject *) u;
nothing: nothing:
/* nothing to replace; return original string (when possible) */ /* nothing to replace; return original string (when possible) */
if (PyUnicode_CheckExact(self)) { if (PyUnicode_CheckExact(self)) {
Py_INCREF(self); Py_INCREF(self);
@ -6472,7 +6472,7 @@ nothing:
/* --- Unicode Object Methods --------------------------------------------- */ /* --- Unicode Object Methods --------------------------------------------- */
PyDoc_STRVAR(title__doc__, PyDoc_STRVAR(title__doc__,
"S.title() -> str\n\ "S.title() -> str\n\
\n\ \n\
Return a titlecased version of S, i.e. words start with title case\n\ Return a titlecased version of S, i.e. words start with title case\n\
characters, all remaining cased characters have lower case."); characters, all remaining cased characters have lower case.");
@ -6484,7 +6484,7 @@ unicode_title(PyUnicodeObject *self)
} }
PyDoc_STRVAR(capitalize__doc__, PyDoc_STRVAR(capitalize__doc__,
"S.capitalize() -> str\n\ "S.capitalize() -> str\n\
\n\ \n\
Return a capitalized version of S, i.e. make the first character\n\ Return a capitalized version of S, i.e. make the first character\n\
have upper case."); have upper case.");
@ -6497,7 +6497,7 @@ unicode_capitalize(PyUnicodeObject *self)
#if 0 #if 0
PyDoc_STRVAR(capwords__doc__, PyDoc_STRVAR(capwords__doc__,
"S.capwords() -> str\n\ "S.capwords() -> str\n\
\n\ \n\
Apply .capitalize() to all words in S and return the result with\n\ Apply .capitalize() to all words in S and return the result with\n\
normalized whitespace (all whitespace strings are replaced by ' ')."); normalized whitespace (all whitespace strings are replaced by ' ').");
@ -6527,7 +6527,7 @@ unicode_capwords(PyUnicodeObject *self)
/* Join the words to form a new string */ /* Join the words to form a new string */
item = PyUnicode_Join(NULL, list); item = PyUnicode_Join(NULL, list);
onError: onError:
Py_DECREF(list); Py_DECREF(list);
return (PyObject *)item; return (PyObject *)item;
} }
@ -6561,7 +6561,7 @@ convert_uc(PyObject *obj, void *addr)
} }
PyDoc_STRVAR(center__doc__, PyDoc_STRVAR(center__doc__,
"S.center(width[, fillchar]) -> str\n\ "S.center(width[, fillchar]) -> str\n\
\n\ \n\
Return S centered in a string of length width. Padding is\n\ Return S centered in a string of length width. Padding is\n\
done using the specified fill character (default is a space)"); done using the specified fill character (default is a space)");
@ -6824,7 +6824,7 @@ PyObject *PyUnicode_Concat(PyObject *left,
Py_DECREF(v); Py_DECREF(v);
return (PyObject *)w; return (PyObject *)w;
onError: onError:
Py_XDECREF(u); Py_XDECREF(u);
Py_XDECREF(v); Py_XDECREF(v);
return NULL; return NULL;
@ -6854,7 +6854,7 @@ PyUnicode_AppendAndDel(PyObject **pleft, PyObject *right)
} }
PyDoc_STRVAR(count__doc__, PyDoc_STRVAR(count__doc__,
"S.count(sub[, start[, end]]) -> int\n\ "S.count(sub[, start[, end]]) -> int\n\
\n\ \n\
Return the number of non-overlapping occurrences of substring sub in\n\ Return the number of non-overlapping occurrences of substring sub in\n\
string S[start:end]. Optional arguments start and end are\n\ string S[start:end]. Optional arguments start and end are\n\
@ -6890,7 +6890,7 @@ unicode_count(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(encode__doc__, PyDoc_STRVAR(encode__doc__,
"S.encode([encoding[, errors]]) -> bytes\n\ "S.encode([encoding[, errors]]) -> bytes\n\
\n\ \n\
Encode S using the codec registered for encoding. encoding defaults\n\ Encode S using the codec registered for encoding. encoding defaults\n\
to the default encoding. errors may be given to set a different error\n\ to the default encoding. errors may be given to set a different error\n\
@ -6926,7 +6926,7 @@ unicode_encode(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(expandtabs__doc__, PyDoc_STRVAR(expandtabs__doc__,
"S.expandtabs([tabsize]) -> str\n\ "S.expandtabs([tabsize]) -> str\n\
\n\ \n\
Return a copy of S where all tab characters are expanded using spaces.\n\ Return a copy of S where all tab characters are expanded using spaces.\n\
If tabsize is not given, a tab size of 8 characters is assumed."); If tabsize is not given, a tab size of 8 characters is assumed.");
@ -7013,7 +7013,7 @@ unicode_expandtabs(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(find__doc__, PyDoc_STRVAR(find__doc__,
"S.find(sub[, start[, end]]) -> int\n\ "S.find(sub[, start[, end]]) -> int\n\
\n\ \n\
Return the lowest index in S where substring sub is found,\n\ Return the lowest index in S where substring sub is found,\n\
such that sub is contained within s[start:end]. Optional\n\ such that sub is contained within s[start:end]. Optional\n\
@ -7078,7 +7078,7 @@ unicode_hash(PyUnicodeObject *self)
} }
PyDoc_STRVAR(index__doc__, PyDoc_STRVAR(index__doc__,
"S.index(sub[, start[, end]]) -> int\n\ "S.index(sub[, start[, end]]) -> int\n\
\n\ \n\
Like S.find() but raise ValueError when the substring is not found."); Like S.find() but raise ValueError when the substring is not found.");
@ -7110,7 +7110,7 @@ unicode_index(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(islower__doc__, PyDoc_STRVAR(islower__doc__,
"S.islower() -> bool\n\ "S.islower() -> bool\n\
\n\ \n\
Return True if all cased characters in S are lowercase and there is\n\ Return True if all cased characters in S are lowercase and there is\n\
at least one cased character in S, False otherwise."); at least one cased character in S, False otherwise.");
@ -7144,7 +7144,7 @@ unicode_islower(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isupper__doc__, PyDoc_STRVAR(isupper__doc__,
"S.isupper() -> bool\n\ "S.isupper() -> bool\n\
\n\ \n\
Return True if all cased characters in S are uppercase and there is\n\ Return True if all cased characters in S are uppercase and there is\n\
at least one cased character in S, False otherwise."); at least one cased character in S, False otherwise.");
@ -7178,7 +7178,7 @@ unicode_isupper(PyUnicodeObject *self)
} }
PyDoc_STRVAR(istitle__doc__, PyDoc_STRVAR(istitle__doc__,
"S.istitle() -> bool\n\ "S.istitle() -> bool\n\
\n\ \n\
Return True if S is a titlecased string and there is at least one\n\ Return True if S is a titlecased string and there is at least one\n\
character in S, i.e. upper- and titlecase characters may only\n\ character in S, i.e. upper- and titlecase characters may only\n\
@ -7226,7 +7226,7 @@ unicode_istitle(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isspace__doc__, PyDoc_STRVAR(isspace__doc__,
"S.isspace() -> bool\n\ "S.isspace() -> bool\n\
\n\ \n\
Return True if all characters in S are whitespace\n\ Return True if all characters in S are whitespace\n\
and there is at least one character in S, False otherwise."); and there is at least one character in S, False otherwise.");
@ -7255,7 +7255,7 @@ unicode_isspace(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isalpha__doc__, PyDoc_STRVAR(isalpha__doc__,
"S.isalpha() -> bool\n\ "S.isalpha() -> bool\n\
\n\ \n\
Return True if all characters in S are alphabetic\n\ Return True if all characters in S are alphabetic\n\
and there is at least one character in S, False otherwise."); and there is at least one character in S, False otherwise.");
@ -7284,7 +7284,7 @@ unicode_isalpha(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isalnum__doc__, PyDoc_STRVAR(isalnum__doc__,
"S.isalnum() -> bool\n\ "S.isalnum() -> bool\n\
\n\ \n\
Return True if all characters in S are alphanumeric\n\ Return True if all characters in S are alphanumeric\n\
and there is at least one character in S, False otherwise."); and there is at least one character in S, False otherwise.");
@ -7313,7 +7313,7 @@ unicode_isalnum(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isdecimal__doc__, PyDoc_STRVAR(isdecimal__doc__,
"S.isdecimal() -> bool\n\ "S.isdecimal() -> bool\n\
\n\ \n\
Return True if there are only decimal characters in S,\n\ Return True if there are only decimal characters in S,\n\
False otherwise."); False otherwise.");
@ -7342,7 +7342,7 @@ unicode_isdecimal(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isdigit__doc__, PyDoc_STRVAR(isdigit__doc__,
"S.isdigit() -> bool\n\ "S.isdigit() -> bool\n\
\n\ \n\
Return True if all characters in S are digits\n\ Return True if all characters in S are digits\n\
and there is at least one character in S, False otherwise."); and there is at least one character in S, False otherwise.");
@ -7371,7 +7371,7 @@ unicode_isdigit(PyUnicodeObject *self)
} }
PyDoc_STRVAR(isnumeric__doc__, PyDoc_STRVAR(isnumeric__doc__,
"S.isnumeric() -> bool\n\ "S.isnumeric() -> bool\n\
\n\ \n\
Return True if there are only numeric characters in S,\n\ Return True if there are only numeric characters in S,\n\
False otherwise."); False otherwise.");
@ -7429,7 +7429,7 @@ PyUnicode_IsIdentifier(PyObject *self)
} }
PyDoc_STRVAR(isidentifier__doc__, PyDoc_STRVAR(isidentifier__doc__,
"S.isidentifier() -> bool\n\ "S.isidentifier() -> bool\n\
\n\ \n\
Return True if S is a valid identifier according\n\ Return True if S is a valid identifier according\n\
to the language definition."); to the language definition.");
@ -7441,7 +7441,7 @@ unicode_isidentifier(PyObject *self)
} }
PyDoc_STRVAR(isprintable__doc__, PyDoc_STRVAR(isprintable__doc__,
"S.isprintable() -> bool\n\ "S.isprintable() -> bool\n\
\n\ \n\
Return True if all characters in S are considered\n\ Return True if all characters in S are considered\n\
printable in repr() or S is empty, False otherwise."); printable in repr() or S is empty, False otherwise.");
@ -7467,7 +7467,7 @@ unicode_isprintable(PyObject *self)
} }
PyDoc_STRVAR(join__doc__, PyDoc_STRVAR(join__doc__,
"S.join(sequence) -> str\n\ "S.join(sequence) -> str\n\
\n\ \n\
Return a string which is the concatenation of the strings in the\n\ Return a string which is the concatenation of the strings in the\n\
sequence. The separator between elements is S."); sequence. The separator between elements is S.");
@ -7485,7 +7485,7 @@ unicode_length(PyUnicodeObject *self)
} }
PyDoc_STRVAR(ljust__doc__, PyDoc_STRVAR(ljust__doc__,
"S.ljust(width[, fillchar]) -> str\n\ "S.ljust(width[, fillchar]) -> str\n\
\n\ \n\
Return S left-justified in a Unicode string of length width. Padding is\n\ Return S left-justified in a Unicode string of length width. Padding is\n\
done using the specified fill character (default is a space)."); done using the specified fill character (default is a space).");
@ -7508,7 +7508,7 @@ unicode_ljust(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(lower__doc__, PyDoc_STRVAR(lower__doc__,
"S.lower() -> str\n\ "S.lower() -> str\n\
\n\ \n\
Return a copy of the string S converted to lowercase."); Return a copy of the string S converted to lowercase.");
@ -7617,7 +7617,7 @@ do_argstrip(PyUnicodeObject *self, int striptype, PyObject *args)
PyDoc_STRVAR(strip__doc__, PyDoc_STRVAR(strip__doc__,
"S.strip([chars]) -> str\n\ "S.strip([chars]) -> str\n\
\n\ \n\
Return a copy of the string S with leading and trailing\n\ Return a copy of the string S with leading and trailing\n\
whitespace removed.\n\ whitespace removed.\n\
@ -7634,7 +7634,7 @@ unicode_strip(PyUnicodeObject *self, PyObject *args)
PyDoc_STRVAR(lstrip__doc__, PyDoc_STRVAR(lstrip__doc__,
"S.lstrip([chars]) -> str\n\ "S.lstrip([chars]) -> str\n\
\n\ \n\
Return a copy of the string S with leading whitespace removed.\n\ Return a copy of the string S with leading whitespace removed.\n\
If chars is given and not None, remove characters in chars instead."); If chars is given and not None, remove characters in chars instead.");
@ -7650,7 +7650,7 @@ unicode_lstrip(PyUnicodeObject *self, PyObject *args)
PyDoc_STRVAR(rstrip__doc__, PyDoc_STRVAR(rstrip__doc__,
"S.rstrip([chars]) -> str\n\ "S.rstrip([chars]) -> str\n\
\n\ \n\
Return a copy of the string S with trailing whitespace removed.\n\ Return a copy of the string S with trailing whitespace removed.\n\
If chars is given and not None, remove characters in chars instead."); If chars is given and not None, remove characters in chars instead.");
@ -7756,7 +7756,7 @@ PyObject *PyUnicode_Replace(PyObject *obj,
} }
PyDoc_STRVAR(replace__doc__, PyDoc_STRVAR(replace__doc__,
"S.replace (old, new[, count]) -> str\n\ "S.replace (old, new[, count]) -> str\n\
\n\ \n\
Return a copy of S with all occurrences of substring\n\ Return a copy of S with all occurrences of substring\n\
old replaced by new. If the optional argument count is\n\ old replaced by new. If the optional argument count is\n\
@ -7938,7 +7938,7 @@ PyObject *unicode_repr(PyObject *unicode)
} }
PyDoc_STRVAR(rfind__doc__, PyDoc_STRVAR(rfind__doc__,
"S.rfind(sub[, start[, end]]) -> int\n\ "S.rfind(sub[, start[, end]]) -> int\n\
\n\ \n\
Return the highest index in S where substring sub is found,\n\ Return the highest index in S where substring sub is found,\n\
such that sub is contained within s[start:end]. Optional\n\ such that sub is contained within s[start:end]. Optional\n\
@ -7969,7 +7969,7 @@ unicode_rfind(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(rindex__doc__, PyDoc_STRVAR(rindex__doc__,
"S.rindex(sub[, start[, end]]) -> int\n\ "S.rindex(sub[, start[, end]]) -> int\n\
\n\ \n\
Like S.rfind() but raise ValueError when the substring is not found."); Like S.rfind() but raise ValueError when the substring is not found.");
@ -8000,7 +8000,7 @@ unicode_rindex(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(rjust__doc__, PyDoc_STRVAR(rjust__doc__,
"S.rjust(width[, fillchar]) -> str\n\ "S.rjust(width[, fillchar]) -> str\n\
\n\ \n\
Return S right-justified in a string of length width. Padding is\n\ Return S right-justified in a string of length width. Padding is\n\
done using the specified fill character (default is a space)."); done using the specified fill character (default is a space).");
@ -8047,7 +8047,7 @@ PyObject *PyUnicode_Split(PyObject *s,
} }
PyDoc_STRVAR(split__doc__, PyDoc_STRVAR(split__doc__,
"S.split([sep[, maxsplit]]) -> list of strings\n\ "S.split([sep[, maxsplit]]) -> list of strings\n\
\n\ \n\
Return a list of the words in S, using sep as the\n\ Return a list of the words in S, using sep as the\n\
delimiter string. If maxsplit is given, at most maxsplit\n\ delimiter string. If maxsplit is given, at most maxsplit\n\
@ -8128,7 +8128,7 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in)
} }
PyDoc_STRVAR(partition__doc__, PyDoc_STRVAR(partition__doc__,
"S.partition(sep) -> (head, sep, tail)\n\ "S.partition(sep) -> (head, sep, tail)\n\
\n\ \n\
Search for the separator sep in S, and return the part before it,\n\ Search for the separator sep in S, and return the part before it,\n\
the separator itself, and the part after it. If the separator is not\n\ the separator itself, and the part after it. If the separator is not\n\
@ -8141,7 +8141,7 @@ unicode_partition(PyUnicodeObject *self, PyObject *separator)
} }
PyDoc_STRVAR(rpartition__doc__, PyDoc_STRVAR(rpartition__doc__,
"S.rpartition(sep) -> (tail, sep, head)\n\ "S.rpartition(sep) -> (tail, sep, head)\n\
\n\ \n\
Search for the separator sep in S, starting at the end of S, and return\n\ Search for the separator sep in S, starting at the end of S, and return\n\
the part before it, the separator itself, and the part after it. If the\n\ the part before it, the separator itself, and the part after it. If the\n\
@ -8178,7 +8178,7 @@ PyObject *PyUnicode_RSplit(PyObject *s,
} }
PyDoc_STRVAR(rsplit__doc__, PyDoc_STRVAR(rsplit__doc__,
"S.rsplit([sep[, maxsplit]]) -> list of strings\n\ "S.rsplit([sep[, maxsplit]]) -> list of strings\n\
\n\ \n\
Return a list of the words in S, using sep as the\n\ Return a list of the words in S, using sep as the\n\
delimiter string, starting at the end of the string and\n\ delimiter string, starting at the end of the string and\n\
@ -8204,7 +8204,7 @@ unicode_rsplit(PyUnicodeObject *self, PyObject *args)
} }
PyDoc_STRVAR(splitlines__doc__, PyDoc_STRVAR(splitlines__doc__,
"S.splitlines([keepends]) -> list of strings\n\ "S.splitlines([keepends]) -> list of strings\n\
\n\ \n\
Return a list of the lines in S, breaking at line boundaries.\n\ Return a list of the lines in S, breaking at line boundaries.\n\
Line breaks are not included in the resulting list unless keepends\n\ Line breaks are not included in the resulting list unless keepends\n\
@ -8234,7 +8234,7 @@ PyObject *unicode_str(PyObject *self)
} }
PyDoc_STRVAR(swapcase__doc__, PyDoc_STRVAR(swapcase__doc__,
"S.swapcase() -> str\n\ "S.swapcase() -> str\n\
\n\ \n\
Return a copy of S with uppercase characters converted to lowercase\n\ Return a copy of S with uppercase characters converted to lowercase\n\
and vice versa."); and vice versa.");
@ -8246,7 +8246,7 @@ unicode_swapcase(PyUnicodeObject *self)
} }
PyDoc_STRVAR(maketrans__doc__, PyDoc_STRVAR(maketrans__doc__,
"str.maketrans(x[, y[, z]]) -> dict (static method)\n\ "str.maketrans(x[, y[, z]]) -> dict (static method)\n\
\n\ \n\
Return a translation table usable for str.translate().\n\ Return a translation table usable for str.translate().\n\
If there is only one argument, it must be a dictionary mapping Unicode\n\ If there is only one argument, it must be a dictionary mapping Unicode\n\
@ -8349,7 +8349,7 @@ unicode_maketrans(PyUnicodeObject *null, PyObject *args)
} }
PyDoc_STRVAR(translate__doc__, PyDoc_STRVAR(translate__doc__,
"S.translate(table) -> str\n\ "S.translate(table) -> str\n\
\n\ \n\
Return a copy of the string S, where all characters have been mapped\n\ Return a copy of the string S, where all characters have been mapped\n\
through the given translation table, which must be a mapping of\n\ through the given translation table, which must be a mapping of\n\
@ -8364,7 +8364,7 @@ unicode_translate(PyUnicodeObject *self, PyObject *table)
} }
PyDoc_STRVAR(upper__doc__, PyDoc_STRVAR(upper__doc__,
"S.upper() -> str\n\ "S.upper() -> str\n\
\n\ \n\
Return a copy of S converted to uppercase."); Return a copy of S converted to uppercase.");
@ -8375,7 +8375,7 @@ unicode_upper(PyUnicodeObject *self)
} }
PyDoc_STRVAR(zfill__doc__, PyDoc_STRVAR(zfill__doc__,
"S.zfill(width) -> str\n\ "S.zfill(width) -> str\n\
\n\ \n\
Pad a numeric string S with zeros on the left, to fill a field\n\ Pad a numeric string S with zeros on the left, to fill a field\n\
of the specified width. The string S is never truncated."); of the specified width. The string S is never truncated.");
@ -8427,7 +8427,7 @@ unicode_freelistsize(PyUnicodeObject *self)
#endif #endif
PyDoc_STRVAR(startswith__doc__, PyDoc_STRVAR(startswith__doc__,
"S.startswith(prefix[, start[, end]]) -> bool\n\ "S.startswith(prefix[, start[, end]]) -> bool\n\
\n\ \n\
Return True if S starts with the specified prefix, False otherwise.\n\ Return True if S starts with the specified prefix, False otherwise.\n\
With optional start, test S beginning at that position.\n\ With optional start, test S beginning at that position.\n\
@ -8473,7 +8473,7 @@ unicode_startswith(PyUnicodeObject *self,
PyDoc_STRVAR(endswith__doc__, PyDoc_STRVAR(endswith__doc__,
"S.endswith(suffix[, start[, end]]) -> bool\n\ "S.endswith(suffix[, start[, end]]) -> bool\n\
\n\ \n\
Return True if S ends with the specified suffix, False otherwise.\n\ Return True if S ends with the specified suffix, False otherwise.\n\
With optional start, test S beginning at that position.\n\ With optional start, test S beginning at that position.\n\
@ -8520,7 +8520,7 @@ unicode_endswith(PyUnicodeObject *self,
#include "stringlib/string_format.h" #include "stringlib/string_format.h"
PyDoc_STRVAR(format__doc__, PyDoc_STRVAR(format__doc__,
"S.format(*args, **kwargs) -> str\n\ "S.format(*args, **kwargs) -> str\n\
\n\ \n\
"); ");
@ -8538,7 +8538,7 @@ unicode__format__(PyObject* self, PyObject* args)
} }
PyDoc_STRVAR(p_format__doc__, PyDoc_STRVAR(p_format__doc__,
"S.__format__(format_spec) -> str\n\ "S.__format__(format_spec) -> str\n\
\n\ \n\
"); ");
@ -8550,7 +8550,7 @@ unicode__sizeof__(PyUnicodeObject *v)
} }
PyDoc_STRVAR(sizeof__doc__, PyDoc_STRVAR(sizeof__doc__,
"S.__sizeof__() -> size of S in memory, in bytes"); "S.__sizeof__() -> size of S in memory, in bytes");
static PyObject * static PyObject *
unicode_getnewargs(PyUnicodeObject *v) unicode_getnewargs(PyUnicodeObject *v)
@ -9475,7 +9475,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
PyDoc_STRVAR(unicode_doc, PyDoc_STRVAR(unicode_doc,
"str(string[, encoding[, errors]]) -> str\n\ "str(string[, encoding[, errors]]) -> str\n\
\n\ \n\
Create a new string object from the given encoded string.\n\ Create a new string object from the given encoded string.\n\
encoding defaults to the current default string encoding.\n\ encoding defaults to the current default string encoding.\n\
@ -9899,8 +9899,8 @@ Py_UNICODE_strchr(const Py_UNICODE *s, Py_UNICODE c)
/* /*
Local variables: Local variables:
c-basic-offset: 4 c-basic-offset: 4
indent-tabs-mode: nil indent-tabs-mode: nil
End: End:
*/ */