Removed usages and examples of subclassing from (object) from py2

Author: PythonCHB

source/examples/context_managers/context_manager.py

@@ -1,7 +1,7 @@
 # Demo of a contextmanager
 
 
-class Context(object):
+class Context:
     """
     from Doug Hellmann, PyMOTW
     https://pymotw.com/3/contextlib/#module-contextlib

source/examples/metaprogramming/my_solution.py

@@ -1,5 +1,6 @@
 # original class made as simple as possible
-class TestClass(object):
+
+class TestClass:
 
     engine = None
 
@@ -22,9 +23,9 @@ def get_privilege(self):
         return self.data, TestClass.engine
 
 
-class MyClass(object):
-    
-    class __MyClass(object):
+class MyClass:
+
+    class __MyClass:
         def __init__(self, db_config):
             self.db_config = db_config
             self.data = None

source/examples/metaprogramming/start_class.py

@@ -1,7 +1,6 @@
 import sqlalchemy
 
-
-class AccessTable(object):
+class AccessTable:
 
     engine = None
 
@@ -49,7 +48,7 @@ def get_privilege(self, name, group):
         access = self.metadata.tables['access']
         select = sqlalchemy.select([access.c.privilege]).where(sqlalchemy.sql.and_(access.c.name == name,
             access.c.group == group))
-        
+
         # TODO handle result including case where it doesn't find any records
         _result = engine.execute(select)
         return 'readwrite'

source/examples/multiple_inheritance/diamond.py

@@ -36,7 +36,7 @@
 """
 
 
-class A(object):
+class A:
     def do_your_stuff(self):
         print("doing A's stuff")
 

source/examples/multiple_inheritance/diamond_super.py

@@ -34,7 +34,7 @@
 """
 
 
-class A(object):
+class A:
     def do_your_stuff(self):
         print("doing A's stuff")
 

source/examples/multiple_inheritance/mro.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
-class A(object):
+class A:
     def my_method(self):
         print("called A")
 

source/examples/multiple_inheritance/super_test.ipynb

@@ -38,7 +38,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -74,7 +74,7 @@
     "python3 fills these in for you at run time, but in python2, you needed to specify them:\n",
     "\n",
     "```\n",
-    "class A(object):\n",
+    "class A:\n",
     "    def __init__(self):\n",
     "        super(A, self).__init__()\n",
     "```\n",
@@ -90,7 +90,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -115,7 +115,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -132,7 +132,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -142,7 +142,7 @@
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-7-89cc2a7e6da3>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0msuper\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mD\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mc\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
+      "\u001b[0;32m<ipython-input-5-f817bbf8c6b4>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0msuper\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mD\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mc\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
       "\u001b[0;31mTypeError\u001b[0m: super(type, obj): obj must be an instance or subtype of type"
      ]
     }
@@ -160,7 +160,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -178,7 +178,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -196,7 +196,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -220,10 +220,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {
-    "collapsed": true
-   },
+   "execution_count": 9,
+   "metadata": {},
    "outputs": [],
    "source": [
     "# without super()\n",
@@ -245,7 +243,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -281,7 +279,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -301,7 +299,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -340,7 +338,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -365,7 +363,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -396,10 +394,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
-   "metadata": {
-    "collapsed": true
-   },
+   "execution_count": 15,
+   "metadata": {},
    "outputs": [],
    "source": [
     "class Base():\n",
@@ -424,7 +420,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -451,7 +447,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
@@ -460,7 +456,7 @@
        "(__main__.A, __main__.Base, object)"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -480,7 +476,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -507,7 +503,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
@@ -540,9 +536,14 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": []
   }
@@ -563,7 +564,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.2"
+   "version": "3.8.6"
   }
  },
  "nbformat": 4,

source/examples/multiple_inheritance/super_test.py

@@ -50,7 +50,7 @@ def __init__(self):
 # specify them:
 #
 # ```
-# class A(object):
+# class A:
 #     def __init__(self):
 #         super(A, self).__init__()
 # ```

source/examples/nosql/address_book_model.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
 """
-sample data for NOSQL examples
+Sample data for NOSQL examples
 
 This version has a not completely-trival data model
 """
 
 
-class Person(object):
+class Person:
     """
     class to represent an individual person
     """
@@ -43,7 +43,7 @@ def __repr__(self):
         return self.__str__()
 
 
-class Address(object):
+class Address:
     """
     class that represents an address
     """
@@ -70,11 +70,11 @@ def __str__(self):
         return msg
 
 
-class Household(object):
+class Household:
     """
     Class that represents a Household.
 
-    A household has one or more people, and a Location
+    A household has one or more people, and an address
     """
 
     def __init__(self,
@@ -97,7 +97,7 @@ def __repr__(self):
         return self.__str__()
 
 
-class Business(Household):
+class Business:
     """
     Class that represents a Business
 
@@ -108,7 +108,7 @@ class Business(Household):
     pass
 
 
-class AddressBook(object):
+class AddressBook:
     """
     And address book -- has people, households, businesses.
 

source/examples/nosql/address_book_mongo.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-sample data for NOSQL examples
+Sample data for NOSQL examples
 
 This version uses mongoDB to store the data.
 
@@ -168,7 +168,7 @@ class Business(Household):
     pass
 
 
-class AddressBook(object):
+class AddressBook:
     """
     An address book -- has people, households, businesses.
 
@@ -223,7 +223,8 @@ def find_people(self, name=''):
         Find all the people with name in their name somewhere
         """
         # fixme -- can this query be combined?
-        # like this: db.inventory.find( { $or: [ { qty: { $lt: 20 } }, { sale: true } ] } )
+        # like this:
+        #   db.inventory.find( { $or: [ { qty: { $lt: 20 } }, { sale: true } ] } )
 
         cursor = self.people.find({"first_name": {'$regex': '.*' + name + '.*',
                                                   '$options': 'i'}})