Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions django-stubs/contrib/admin/options.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
extra_tags: str = ...,
fail_silently: bool = ...,
) -> None: ...
def save_form(self, request: Any, form: Any, change: Any): ...
def save_form(self, request: Any, form: Any, change: Any) -> Any: ...
def save_model(self, request: Any, obj: _ModelT, form: Any, change: Any) -> None: ...
def delete_model(self, request: HttpRequest, obj: _ModelT) -> None: ...
def delete_queryset(self, request: HttpRequest, queryset: QuerySet) -> None: ...
Expand All @@ -255,7 +255,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
change: bool = ...,
form_url: str = ...,
obj: Optional[_ModelT] = ...,
): ...
) -> Any: ...
def response_add(
self, request: HttpRequest, obj: _ModelT, post_url_continue: Optional[str] = ...
) -> HttpResponse: ...
Expand All @@ -265,7 +265,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
# Probably FileResponse cannot come from ModelAdmin views
def response_action(self, request: HttpRequest, queryset: QuerySet) -> Optional[HttpResponse]: ...
def response_delete(self, request: HttpRequest, obj_display: str, obj_id: int) -> HttpResponse: ...
def render_delete_form(self, request: Any, context: Any): ...
def render_delete_form(self, request: Any, context: Any) -> Any: ...
def get_inline_formsets(
self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[_ModelT] = ...
) -> List[Any]: ...
Expand Down
4 changes: 2 additions & 2 deletions django-stubs/contrib/admin/utils.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class NestedObjects(Collector):
def nested(self, format_callback: Callable = ...) -> List[Any]: ...
def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...

class ModelFormatDict(TypedDict):
class _ModelFormatDict(TypedDict):
verbose_name: str
verbose_name_plural: str

def model_format_dict(obj: Union[Model, Type[Model], QuerySet, Options[Model]]) -> ModelFormatDict: ...
def model_format_dict(obj: Union[Model, Type[Model], QuerySet, Options[Model]]) -> _ModelFormatDict: ...
def model_ngettext(obj: Union[Options, QuerySet], n: Optional[int] = ...) -> str: ...
def lookup_field(
name: Union[Callable, str], obj: Model, model_admin: Optional[BaseModelAdmin] = ...
Expand Down
6 changes: 3 additions & 3 deletions django-stubs/contrib/gis/admin/options.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class GeoModelAdmin(ModelAdmin):
debug: bool = ...
widget: Any = ...
@property
def media(self): ...
def formfield_for_dbfield(self, db_field: Any, request: Any, **kwargs: Any): ...
def get_map_widget(self, db_field: Any): ...
def media(self) -> Any: ...
def formfield_for_dbfield(self, db_field: Any, request: Any, **kwargs: Any) -> Any: ...
def get_map_widget(self, db_field: Any) -> Any: ...

class OSMGeoAdmin(GeoModelAdmin):
map_template: str = ...
Expand Down
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/admin/widgets.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ geo_context: Any
logger: Logger

class OpenLayersWidget(Textarea):
def get_context(self, name: Any, value: Any, attrs: Any): ...
def map_options(self): ...
def get_context(self, name: Any, value: Any, attrs: Any) -> Any: ...
def map_options(self) -> Any: ...
30 changes: 15 additions & 15 deletions django-stubs/contrib/gis/db/backends/base/models.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ from typing import Any

class SpatialRefSysMixin:
@property
def srs(self): ...
def srs(self) -> Any: ...
@property
def ellipsoid(self): ...
def ellipsoid(self) -> Any: ...
@property
def name(self): ...
def name(self) -> Any: ...
@property
def spheroid(self): ...
def spheroid(self) -> Any: ...
@property
def datum(self): ...
def datum(self) -> Any: ...
@property
def projected(self): ...
def projected(self) -> Any: ...
@property
def local(self): ...
def local(self) -> Any: ...
@property
def geographic(self): ...
def geographic(self) -> Any: ...
@property
def linear_name(self): ...
def linear_name(self) -> Any: ...
@property
def linear_units(self): ...
def linear_units(self) -> Any: ...
@property
def angular_name(self): ...
def angular_name(self) -> Any: ...
@property
def angular_units(self): ...
def angular_units(self) -> Any: ...
@property
def units(self): ...
def units(self) -> Any: ...
@classmethod
def get_units(cls, wkt: Any): ...
def get_units(cls, wkt: Any) -> Any: ...
@classmethod
def get_spheroid(cls, wkt: Any, string: bool = ...): ...
def get_spheroid(cls, wkt: Any, string: bool = ...) -> Any: ...
12 changes: 6 additions & 6 deletions django-stubs/contrib/gis/db/backends/base/operations.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ class BaseSpatialOperations:
from_text: bool = ...
def convert_extent(self, box: Any, srid: Any) -> Any: ...
def convert_extent3d(self, box: Any, srid: Any) -> Any: ...
def geo_quote_name(self, name: Any): ...
def geo_quote_name(self, name: Any) -> Any: ...
def geo_db_type(self, f: Any) -> Any: ...
def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...
def check_expression_support(self, expression: Any) -> None: ...
def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
def spatial_function_name(self, func_name: Any): ...
def spatial_function_name(self, func_name: Any) -> Any: ...
def geometry_columns(self) -> Any: ...
def spatial_ref_sys(self) -> Any: ...
distance_expr_for_lookup: Any = ...
def get_db_converters(self, expression: Any): ...
def get_db_converters(self, expression: Any) -> Any: ...
def get_geometry_converter(self, expression: Any) -> Any: ...
def get_area_att_for_field(self, field: Any): ...
def get_distance_att_for_field(self, field: Any): ...
def get_area_att_for_field(self, field: Any) -> Any: ...
def get_distance_att_for_field(self, field: Any) -> Any: ...
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/db/backends/mysql/introspection.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ from django.db.backends.mysql.introspection import DatabaseIntrospection as Data

class MySQLIntrospection(DatabaseIntrospection):
data_types_reverse: Any = ...
def get_geometry_type(self, table_name: Any, description: Any): ...
def supports_spatial_index(self, cursor: Any, table_name: Any): ...
def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...
def supports_spatial_index(self, cursor: Any, table_name: Any) -> Any: ...
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/db/backends/mysql/schema.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor):
sql_drop_spatial_index: str = ...
geometry_sql: Any = ...
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
def skip_default(self, field: Any): ...
def column_sql(self, model: Any, field: Any, include_default: bool = ...): ...
def skip_default(self, field: Any) -> Any: ...
def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
def create_model(self, model: Any) -> None: ...
def add_field(self, model: Any, field: Any) -> None: ...
def remove_field(self, model: Any, field: Any) -> None: ...
Expand Down
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/db/backends/oracle/introspection.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ from django.db.backends.oracle.introspection import DatabaseIntrospection as Dat

class OracleIntrospection(DatabaseIntrospection):
@property
def data_types_reverse(self): ...
def get_geometry_type(self, table_name: Any, description: Any): ...
def data_types_reverse(self) -> Any: ...
def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...
6 changes: 3 additions & 3 deletions django-stubs/contrib/gis/db/backends/oracle/models.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ class OracleGeometryColumns(models.Model):
db_table: str = ...
managed: bool = ...
@classmethod
def table_name_col(cls): ...
def table_name_col(cls) -> Any: ...
@classmethod
def geom_col_name(cls): ...
def geom_col_name(cls) -> Any: ...

class OracleSpatialRefSys(models.Model, SpatialRefSysMixin):
cs_name: Any = ...
Expand All @@ -30,4 +30,4 @@ class OracleSpatialRefSys(models.Model, SpatialRefSysMixin):
db_table: str = ...
managed: bool = ...
@property
def wkt(self): ...
def wkt(self) -> Any: ...
20 changes: 10 additions & 10 deletions django-stubs/contrib/gis/db/backends/oracle/operations.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations):
select: str = ...
gis_operators: Any = ...
unsupported_functions: Any = ...
def geo_quote_name(self, name: Any): ...
def geo_db_type(self, f: Any): ...
def get_distance(self, f: Any, value: Any, lookup_type: Any): ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
def spatial_aggregate_name(self, agg_name: Any): ...
def geometry_columns(self): ...
def spatial_ref_sys(self): ...
def modify_insert_params(self, placeholder: Any, params: Any): ...
def get_geometry_converter(self, expression: Any): ...
def get_area_att_for_field(self, field: Any): ...
def geo_quote_name(self, name: Any) -> Any: ...
def geo_db_type(self, f: Any) -> Any: ...
def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...
def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
def geometry_columns(self) -> Any: ...
def spatial_ref_sys(self) -> Any: ...
def modify_insert_params(self, placeholder: Any, params: Any) -> Any: ...
def get_geometry_converter(self, expression: Any) -> Any: ...
def get_area_att_for_field(self, field: Any) -> Any: ...
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/db/backends/oracle/schema.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor):
sql_clear_geometry_field_metadata: str = ...
geometry_sql: Any = ...
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
def geo_quote_name(self, name: Any): ...
def column_sql(self, model: Any, field: Any, include_default: bool = ...): ...
def geo_quote_name(self, name: Any) -> Any: ...
def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
def create_model(self, model: Any) -> None: ...
def delete_model(self, model: Any) -> None: ...
def add_field(self, model: Any, field: Any) -> None: ...
Expand Down
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/db/backends/postgis/adapter.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ class PostGISAdapter:
srid: Any = ...
geography: Any = ...
def __init__(self, obj: Any, geography: bool = ...) -> None: ...
def __conform__(self, proto: Any): ...
def __conform__(self, proto: Any) -> Any: ...
def __eq__(self, other: Any) -> Any: ...
def __hash__(self) -> Any: ...
def prepare(self, conn: Any) -> None: ...
def getquoted(self): ...
def getquoted(self) -> Any: ...
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ from django.db.backends.postgresql.introspection import DatabaseIntrospection as
class PostGISIntrospection(DatabaseIntrospection):
postgis_oid_lookup: Any = ...
ignored_tables: Any = ...
def get_field_type(self, data_type: Any, description: Any): ...
def get_geometry_type(self, table_name: Any, description: Any): ...
def get_field_type(self, data_type: Any, description: Any) -> Any: ...
def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...
6 changes: 3 additions & 3 deletions django-stubs/contrib/gis/db/backends/postgis/models.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class PostGISGeometryColumns(models.Model):
db_table: str = ...
managed: bool = ...
@classmethod
def table_name_col(cls): ...
def table_name_col(cls) -> Any: ...
@classmethod
def geom_col_name(cls): ...
def geom_col_name(cls) -> Any: ...

class PostGISSpatialRefSys(models.Model, SpatialRefSysMixin):
srid: Any = ...
Expand All @@ -33,4 +33,4 @@ class PostGISSpatialRefSys(models.Model, SpatialRefSysMixin):
db_table: str = ...
managed: bool = ...
@property
def wkt(self): ...
def wkt(self) -> Any: ...
42 changes: 21 additions & 21 deletions django-stubs/contrib/gis/db/backends/postgis/operations.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ class PostGISOperator(SpatialOperator):
def __init__(
self, geography: bool = ..., raster: Union[bool, Literal["bilateral"]] = ..., **kwargs: Any
) -> None: ...
def check_raster(self, lookup: Any, template_params: Any): ...
def check_raster(self, lookup: Any, template_params: Any) -> Any: ...

class ST_Polygon(Func):
function: str = ...
def __init__(self, expr: Any) -> None: ...
@property
def output_field(self): ...
def output_field(self) -> Any: ...

class PostGISOperations(BaseSpatialOperations, DatabaseOperations):
name: str = ...
Expand All @@ -40,23 +40,23 @@ class PostGISOperations(BaseSpatialOperations, DatabaseOperations):
select: str = ...
select_extent: Any = ...
@property
def function_names(self): ...
def function_names(self) -> Any: ...
@property
def spatial_version(self): ...
def geo_db_type(self, f: Any): ...
def get_distance(self, f: Any, dist_val: Any, lookup_type: Any): ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
def postgis_geos_version(self): ...
def postgis_lib_version(self): ...
def postgis_proj_version(self): ...
def postgis_version(self): ...
def postgis_full_version(self): ...
def postgis_version_tuple(self): ...
def proj_version_tuple(self): ...
def spatial_aggregate_name(self, agg_name: Any): ...
def geometry_columns(self): ...
def spatial_ref_sys(self): ...
def parse_raster(self, value: Any): ...
def distance_expr_for_lookup(self, lhs: Any, rhs: Any, **kwargs: Any): ...
def get_geometry_converter(self, expression: Any): ...
def get_area_att_for_field(self, field: Any): ...
def spatial_version(self) -> Any: ...
def geo_db_type(self, f: Any) -> Any: ...
def get_distance(self, f: Any, dist_val: Any, lookup_type: Any) -> Any: ...
def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...
def postgis_geos_version(self) -> Any: ...
def postgis_lib_version(self) -> Any: ...
def postgis_proj_version(self) -> Any: ...
def postgis_version(self) -> Any: ...
def postgis_full_version(self) -> Any: ...
def postgis_version_tuple(self) -> Any: ...
def proj_version_tuple(self) -> Any: ...
def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
def geometry_columns(self) -> Any: ...
def spatial_ref_sys(self) -> Any: ...
def parse_raster(self, value: Any) -> Any: ...
def distance_expr_for_lookup(self, lhs: Any, rhs: Any, **kwargs: Any) -> Any: ...
def get_geometry_converter(self, expression: Any) -> Any: ...
def get_area_att_for_field(self, field: Any) -> Any: ...
10 changes: 5 additions & 5 deletions django-stubs/contrib/gis/db/backends/postgis/pgraster.pyi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Any

def pack(structure: Any, data: Any): ...
def unpack(structure: Any, data: Any): ...
def chunk(data: Any, index: Any): ...
def from_pgraster(data: Any): ...
def to_pgraster(rast: Any): ...
def pack(structure: Any, data: Any) -> Any: ...
def unpack(structure: Any, data: Any) -> Any: ...
def chunk(data: Any, index: Any) -> Any: ...
def from_pgraster(data: Any) -> Any: ...
def to_pgraster(rast: Any) -> Any: ...
2 changes: 1 addition & 1 deletion django-stubs/contrib/gis/db/backends/postgis/schema.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ class PostGISSchemaEditor(DatabaseSchemaEditor):
rast_index_wrapper: str = ...
sql_alter_column_to_3d: str = ...
sql_alter_column_to_2d: str = ...
def geo_quote_name(self, name: Any): ...
def geo_quote_name(self, name: Any) -> Any: ...
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ from typing import Any
from django.contrib.gis.db.backends.base.adapter import WKTAdapter as WKTAdapter

class SpatiaLiteAdapter(WKTAdapter):
def __conform__(self, protocol: Any): ...
def __conform__(self, protocol: Any) -> Any: ...
2 changes: 1 addition & 1 deletion django-stubs/contrib/gis/db/backends/spatialite/base.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ class DatabaseWrapper(SQLiteDatabaseWrapper):
ops_class: Any = ...
lib_spatialite_paths: Any = ...
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
def get_new_connection(self, conn_params: Any): ...
def get_new_connection(self, conn_params: Any) -> Any: ...
def prepare_database(self) -> None: ...
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ class GeoFlexibleFieldLookupDict(FlexibleFieldLookupDict):

class SpatiaLiteIntrospection(DatabaseIntrospection):
data_types_reverse: Any = ...
def get_geometry_type(self, table_name: Any, description: Any): ...
def get_constraints(self, cursor: Any, table_name: Any): ...
def get_geometry_type(self, table_name: Any, description: Any) -> Any: ...
def get_constraints(self, cursor: Any, table_name: Any) -> Any: ...
6 changes: 3 additions & 3 deletions django-stubs/contrib/gis/db/backends/spatialite/models.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class SpatialiteGeometryColumns(models.Model):
db_table: str = ...
managed: bool = ...
@classmethod
def table_name_col(cls): ...
def table_name_col(cls) -> Any: ...
@classmethod
def geom_col_name(cls): ...
def geom_col_name(cls) -> Any: ...

class SpatialiteSpatialRefSys(models.Model, SpatialRefSysMixin):
srid: Any = ...
Expand All @@ -33,4 +33,4 @@ class SpatialiteSpatialRefSys(models.Model, SpatialRefSysMixin):
db_table: str = ...
managed: bool = ...
@property
def wkt(self): ...
def wkt(self) -> Any: ...
22 changes: 11 additions & 11 deletions django-stubs/contrib/gis/db/backends/spatialite/operations.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class SpatiaLiteOperations(BaseSpatialOperations, DatabaseOperations):
@property
def unsupported_functions(self) -> Set[str]: ... # type: ignore[override]
@property
def spatial_version(self): ...
def spatial_version(self) -> Any: ...
def geo_db_type(self, f: Any) -> None: ...
def get_distance(self, f: Any, value: Any, lookup_type: Any): ...
def geos_version(self): ...
def proj_version(self): ...
def lwgeom_version(self): ...
def spatialite_version(self): ...
def spatialite_version_tuple(self): ...
def spatial_aggregate_name(self, agg_name: Any): ...
def geometry_columns(self): ...
def spatial_ref_sys(self): ...
def get_geometry_converter(self, expression: Any): ...
def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
def geos_version(self) -> Any: ...
def proj_version(self) -> Any: ...
def lwgeom_version(self) -> Any: ...
def spatialite_version(self) -> Any: ...
def spatialite_version_tuple(self) -> Any: ...
def spatial_aggregate_name(self, agg_name: Any) -> Any: ...
def geometry_columns(self) -> Any: ...
def spatial_ref_sys(self) -> Any: ...
def get_geometry_converter(self, expression: Any) -> Any: ...
Loading