diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-11-22 03:18:24 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-11-22 03:18:24 (GMT) |
| commit | da825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9 (patch) | |
| tree | c404bcf71592add5ce026f2267607ca24446b00c /Doc/includes | |
| parent | f213d2317cc167263bb8599e599bddc5537fed1a (diff) | |
| download | cpython-da825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9.zip cpython-da825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9.tar.gz cpython-da825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9.tar.bz2 | |
Merged revisions 86670 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86670 | eric.araujo | 2010-11-22 04:09:19 +0100 (lun., 22 nov. 2010) | 5 lines
Remove unnecessary `object` base class in docs (#10366).
Also add a note about inheritance from `object` being default.
........
Diffstat (limited to 'Doc/includes')
| -rw-r--r-- | Doc/includes/mp_newtype.py | 2 | ||||
| -rw-r--r-- | Doc/includes/sqlite3/adapter_point_1.py | 2 | ||||
| -rw-r--r-- | Doc/includes/sqlite3/adapter_point_2.py | 2 | ||||
| -rw-r--r-- | Doc/includes/sqlite3/converter_point.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/includes/mp_newtype.py b/Doc/includes/mp_newtype.py index d1a55a6..7291743 100644 --- a/Doc/includes/mp_newtype.py +++ b/Doc/includes/mp_newtype.py @@ -12,7 +12,7 @@ import operator ## -class Foo(object): +class Foo: def f(self): print('you called Foo.f()') def g(self): diff --git a/Doc/includes/sqlite3/adapter_point_1.py b/Doc/includes/sqlite3/adapter_point_1.py index 1343acd..6b1af84 100644 --- a/Doc/includes/sqlite3/adapter_point_1.py +++ b/Doc/includes/sqlite3/adapter_point_1.py @@ -1,6 +1,6 @@ import sqlite3 -class Point(object): +class Point: def __init__(self, x, y): self.x, self.y = x, y diff --git a/Doc/includes/sqlite3/adapter_point_2.py b/Doc/includes/sqlite3/adapter_point_2.py index 1e1719a..d670700 100644 --- a/Doc/includes/sqlite3/adapter_point_2.py +++ b/Doc/includes/sqlite3/adapter_point_2.py @@ -1,6 +1,6 @@ import sqlite3 -class Point(object): +class Point: def __init__(self, x, y): self.x, self.y = x, y diff --git a/Doc/includes/sqlite3/converter_point.py b/Doc/includes/sqlite3/converter_point.py index d0707ab..a8861bc 100644 --- a/Doc/includes/sqlite3/converter_point.py +++ b/Doc/includes/sqlite3/converter_point.py @@ -1,6 +1,6 @@ import sqlite3 -class Point(object): +class Point: def __init__(self, x, y): self.x, self.y = x, y |