Merge branch 'corrections' of https://github.com/JvPy/pandas into corrections

Author: JvPy

pandas/io/html.py

@@ -103,7 +103,11 @@ def _get_skiprows(skiprows):
     elif skiprows is None:
         return 0
     raise TypeError(
+<<<<<<< HEAD
         f"{repr(type(skiprows).__name__)} is not a valid type for skipping rows"
+=======
+        "%r is not a valid type for skipping rows" % type(skiprows).__name__
+>>>>>>> 8bc80250a1760b6ee0fbdd26792d122b7adf8244
     )
 
 
@@ -133,7 +137,11 @@ def _read(obj):
         except (TypeError, ValueError):
             pass
     else:
+<<<<<<< HEAD
         raise TypeError(f"Cannot read object of type {repr(type(obj).__name__)}")
+=======
+        raise TypeError("Cannot read object of type %r" % type(obj).__name__)
+>>>>>>> 8bc80250a1760b6ee0fbdd26792d122b7adf8244
     return text