From bc19ff6479261d80f3b1751700b7b9d4d7428211 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 21 Jun 2014 14:07:30 +0200
Subject: [PATCH] Fixed #22793 -- Updated import location for GeometryColumns
 in tests

The old location was removed in cebd8753c6.
Thanks Aymeric Augustin for the report.
---
 django/contrib/gis/tests/gis_migrations/test_operations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/contrib/gis/tests/gis_migrations/test_operations.py b/django/contrib/gis/tests/gis_migrations/test_operations.py
index c6ef682e3c..e8163891cb 100644
--- a/django/contrib/gis/tests/gis_migrations/test_operations.py
+++ b/django/contrib/gis/tests/gis_migrations/test_operations.py
@@ -11,9 +11,9 @@ from django.test import TransactionTestCase
 if HAS_SPATIAL_DB:
     from django.contrib.gis.db.models import fields
     try:
-        from django.contrib.gis.models import GeometryColumns
+        GeometryColumns = connection.ops.geometry_columns()
         HAS_GEOMETRY_COLUMNS = True
-    except ImportError:
+    except NotImplementedError:
         HAS_GEOMETRY_COLUMNS = False