Remove some legacy things from when python 2 was around

dseomn · dseomn · commit 7472083767f3 · 2022-09-16T17:13:28.000-04:00
diff --git a/setup.py b/setup.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/__init__.py b/spanner_orm/__init__.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/api.py b/spanner_orm/admin/api.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/column.py b/spanner_orm/admin/column.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/index.py b/spanner_orm/admin/index.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/index_column.py b/spanner_orm/admin/index_column.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/metadata.py b/spanner_orm/admin/metadata.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +27,7 @@
 from spanner_orm.admin import table
 
 
-class SpannerMetadata(object):
+class SpannerMetadata:
   """Gathers information about a table from Spanner."""
 
   @classmethod
diff --git a/spanner_orm/admin/migration.py b/spanner_orm/admin/migration.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/migration_executor.py b/spanner_orm/admin/migration_executor.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/migration_manager.py b/spanner_orm/admin/migration_manager.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/migration_status.py b/spanner_orm/admin/migration_status.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/schema.py b/spanner_orm/admin/schema.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/scripts.py b/spanner_orm/admin/scripts.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/table.py b/spanner_orm/admin/table.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/admin/update.py b/spanner_orm/admin/update.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/api.py b/spanner_orm/api.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/condition.py b/spanner_orm/condition.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/decorator.py b/spanner_orm/decorator.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/error.py b/spanner_orm/error.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/field.py b/spanner_orm/field.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +43,7 @@ def validate_type(value: Any) -> None:
     raise NotImplementedError
 
 
-class Field(object):
+class Field:
   """Represents a column in a table as a field in a model."""
 
   def __init__(self,
diff --git a/spanner_orm/foreign_key_relationship.py b/spanner_orm/foreign_key_relationship.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +26,7 @@ class ForeignKeyRelationshipConstraint:
   referenced_table: Type[Any]
 
 
-class ForeignKeyRelationship(object):
+class ForeignKeyRelationship:
   """Helps define a foreign key relationship between two models."""
 
   def __init__(self, referenced_table_name: str, columns: Mapping[str, str]):
diff --git a/spanner_orm/index.py b/spanner_orm/index.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +18,7 @@
 from spanner_orm import error
 
 
-class Index(object):
+class Index:
   """Represents an index on a Model."""
   PRIMARY_INDEX = 'PRIMARY_KEY'
 
diff --git a/spanner_orm/metadata.py b/spanner_orm/metadata.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +37,7 @@
 from spanner_orm import relationship
 
 
-class ModelMetadata(object):
+class ModelMetadata:
   """Hold information about a Model extracted from the class attributes."""
 
   def __init__(self,
diff --git a/spanner_orm/model.py b/spanner_orm/model.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/query.py b/spanner_orm/query.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/registry.py b/spanner_orm/registry.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +27,7 @@ def add(self, reference: Type[Any]) -> None:
     self.references.append(reference)
 
 
-class Registry(object):
+class Registry:
 
   def __init__(self):
     self._registered = {}  # type: Dict[str, RegistryComponent]
diff --git a/spanner_orm/relationship.py b/spanner_orm/relationship.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +28,7 @@ class RelationshipConstraint:
   origin_column: str
 
 
-class Relationship(object):
+class Relationship:
   """Helps define a foreign key relationship between two models."""
 
   def __init__(self,
diff --git a/spanner_orm/table_apis.py b/spanner_orm/table_apis.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/testlib/spanner_emulator/emulator.py b/spanner_orm/testlib/spanner_emulator/emulator.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/testlib/spanner_emulator/testlib.py b/spanner_orm/testlib/spanner_emulator/testlib.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/admin_test.py b/spanner_orm/tests/admin_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/api_test.py b/spanner_orm/tests/api_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/condition_test.py b/spanner_orm/tests/condition_test.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/decorator_test.py b/spanner_orm/tests/decorator_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/metadata_test.py b/spanner_orm/tests/metadata_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations/test_1_4a7a7dee0718.py b/spanner_orm/tests/migrations/test_1_4a7a7dee0718.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations/test_2_5c078bbb4d43.py b/spanner_orm/tests/migrations/test_2_5c078bbb4d43.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations/test_3_eceb25f170dd.py b/spanner_orm/tests/migrations/test_3_eceb25f170dd.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations_emulator_test.py b/spanner_orm/tests/migrations_emulator_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations_for_emulator_test/create_foreign_key_test_model.py b/spanner_orm/tests/migrations_for_emulator_test/create_foreign_key_test_model.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations_for_emulator_test/create_small_test_model.py b/spanner_orm/tests/migrations_for_emulator_test/create_small_test_model.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations_for_emulator_test/create_unittest_model.py b/spanner_orm/tests/migrations_for_emulator_test/create_unittest_model.py
@@ -1,4 +1,3 @@
-# Lint as: python3
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/migrations_test.py b/spanner_orm/tests/migrations_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/model_test.py b/spanner_orm/tests/model_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/models.py b/spanner_orm/tests/models.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/query_test.py b/spanner_orm/tests/query_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spanner_orm/tests/update_test.py b/spanner_orm/tests/update_test.py
@@ -1,4 +1,3 @@
-# python3
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# python3`
`2`	`1`	`# Copyright 2019 Google LLC`
`3`	`2`	`#`
`4`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`