mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[4.1.x] Fixed #33886 -- Reallowed using GeoIP2() when GEOS is not installed.
Regression in31bef51d8e. Backport ofe7afb8a180from main
This commit is contained in:
		
				
					committed by
					
						 Mariusz Felisiak
						Mariusz Felisiak
					
				
			
			
				
	
			
			
			
						parent
						
							9e9bdf8dbd
						
					
				
				
					commit
					a3ce58ac4c
				
			| @@ -3,7 +3,6 @@ import socket | ||||
| import geoip2.database | ||||
|  | ||||
| from django.conf import settings | ||||
| from django.contrib.gis.geos import Point | ||||
| from django.core.exceptions import ValidationError | ||||
| from django.core.validators import validate_ipv46_address | ||||
| from django.utils._os import to_path | ||||
| @@ -219,6 +218,9 @@ class GeoIP2: | ||||
|         "Return a GEOS Point object for the given query." | ||||
|         ll = self.lon_lat(query) | ||||
|         if ll: | ||||
|             # Allows importing and using GeoIP2() when GEOS is not installed. | ||||
|             from django.contrib.gis.geos import Point | ||||
|  | ||||
|             return Point(ll, srid=4326) | ||||
|         else: | ||||
|             return None | ||||
|   | ||||
| @@ -9,4 +9,5 @@ Django 4.1.1 fixes several bugs in 4.1. | ||||
| Bugfixes | ||||
| ======== | ||||
|  | ||||
| * ... | ||||
| * Reallowed, following a regression in Django 4.1, using ``GeoIP2()`` when GEOS | ||||
|   is not installed (:ticket:`33886`). | ||||
|   | ||||
		Reference in New Issue
	
	Block a user