Ticket #10842: fix_re_django-1.0.2.diff

Django-1.0.2/django/db/backends/postgresql/operations.py

@@ -2 +2 @@
 
 from django.db.backends import BaseDatabaseOperations
 
-server_version_re = re.compile(r'PostgreSQL (\d{1,2})\.(\d{1,2})\.?(\d{1,2})?')
+server_version_re = re.compile(r'\S+ (\d{1,2})\.(\d{1,2})\.?(\d{1,2})?')
 
 # This DatabaseOperations class lives in here instead of base.py because it's
 # used by both the 'postgresql' and 'postgresql_psycopg2' backends.

Django-1.0.2/django/db/backends/postgresql/version.py

@@ -4 +4 @@
 
 import re
 
-VERSION_RE = re.compile(r'PostgreSQL (\d+)\.(\d+)\.')
+# This reg-exp is intentionally fairly flexible here. Require only the major
+# and minor version numbers, but need to be able to handle standard stuff like:
+#   PostgreSQL 8.3.6
+#   EnterpriseDB 8.3
+#   PostgreSQL 8.3 beta4
+#   PostgreSQL 8.4beta1
+VERSION_RE = re.compile(r'\S+ (\d+)\.(\d+)')
 
 def get_version(cursor):
     """