diff options
| -rw-r--r-- | Modules/itertoolsmodule.c | 22 | ||||
| -rw-r--r-- | Objects/descrobject.c | 12 | ||||
| -rw-r--r-- | Objects/typeobject.c | 2 | ||||
| -rw-r--r-- | PC/bdist_wininst/install.c | 28 | ||||
| -rw-r--r-- | Python/compile.c | 4 |
5 files changed, 34 insertions, 34 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 1f42022..6634a17 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2985,18 +2985,18 @@ def permutations(iterable, r=None): cycles = range(n-r+1, n+1)[::-1] yield tuple(pool[i] for i in indices[:r]) while n: - for i in reversed(range(r)): - cycles[i] -= 1 - if cycles[i] == 0: - indices[i:] = indices[i+1:] + indices[i:i+1] - cycles[i] = n - i + for i in reversed(range(r)): + cycles[i] -= 1 + if cycles[i] == 0: + indices[i:] = indices[i+1:] + indices[i:i+1] + cycles[i] = n - i + else: + j = cycles[i] + indices[i], indices[-j] = indices[-j], indices[i] + yield tuple(pool[i] for i in indices[:r]) + break else: - j = cycles[i] - indices[i], indices[-j] = indices[-j], indices[i] - yield tuple(pool[i] for i in indices[:r]) - break - else: - return + return */ typedef struct { diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 2df5ac5..615f499 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1268,11 +1268,11 @@ PyWrapper_New(PyObject *d, PyObject *self) /* A built-in 'property' type */ /* - class property(object): +class property(object): def __init__(self, fget=None, fset=None, fdel=None, doc=None): if doc is None and fget is not None and hasattr(fget, "__doc__"): - doc = fget.__doc__ + doc = fget.__doc__ self.__get = fget self.__set = fset self.__del = fdel @@ -1280,19 +1280,19 @@ PyWrapper_New(PyObject *d, PyObject *self) def __get__(self, inst, type=None): if inst is None: - return self + return self if self.__get is None: - raise AttributeError, "unreadable attribute" + raise AttributeError, "unreadable attribute" return self.__get(inst) def __set__(self, inst, value): if self.__set is None: - raise AttributeError, "can't set attribute" + raise AttributeError, "can't set attribute" return self.__set(inst, value) def __delete__(self, inst): if self.__del is None: - raise AttributeError, "can't delete attribute" + raise AttributeError, "can't delete attribute" return self.__del(inst) */ diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 0fccecd..d39c943 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4219,7 +4219,7 @@ PyDoc_STRVAR(object_subclasshook_doc, class object: def __format__(self, format_spec): - return format(str(self), format_spec) + return format(str(self), format_spec) */ static PyObject * object_format(PyObject *self, PyObject *args) diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index a0232d2..f4cf348 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -1941,21 +1941,21 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* * The scheme we have to use depends on the Python version... if sys.version < "2.2": - WINDOWS_SCHEME = { - 'purelib': '$base', - 'platlib': '$base', - 'headers': '$base/Include/$dist_name', - 'scripts': '$base/Scripts', - 'data' : '$base', - } + WINDOWS_SCHEME = { + 'purelib': '$base', + 'platlib': '$base', + 'headers': '$base/Include/$dist_name', + 'scripts': '$base/Scripts', + 'data' : '$base', + } else: - WINDOWS_SCHEME = { - 'purelib': '$base/Lib/site-packages', - 'platlib': '$base/Lib/site-packages', - 'headers': '$base/Include/$dist_name', - 'scripts': '$base/Scripts', - 'data' : '$base', - } + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', + 'headers': '$base/Include/$dist_name', + 'scripts': '$base/Scripts', + 'data' : '$base', + } */ scheme = GetScheme(py_major, py_minor); /* Run the pre-install script. */ diff --git a/Python/compile.c b/Python/compile.c index 77d9f4c..686510c 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3330,9 +3330,9 @@ expr_constant(struct compiler *c, expr_ty e) BLOCK finally: if an exception was raised: - exc = copy of (exception, instance, traceback) + exc = copy of (exception, instance, traceback) else: - exc = (None, None, None) + exc = (None, None, None) exit(*exc) */ static int |