Merge remote-tracking branch 'fix-211'

4 files changed, 25 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 09b19e5..a264c90 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ Other changes:
 What's new in psycopg 2.7.5
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+- Allow non-ascii chars in namedtuple fields (regression introduced fixing
+  :ticket':`#211`).
 - Fixed building on Solaris 11 and derivatives such as SmartOS and illumos
   (:ticket:`#677`).
 - Maybe fixed building on MSYS2 (as reported in :ticket:`#658`).
diff --git a/lib/extras.py b/lib/extras.py
index 1f85d53..9c26ccb 100644
--- a/lib/extras.py
+++ b/lib/extras.py
@@ -363,12 +363,15 @@ class NamedTupleCursor(_cursor):
             return
 
     def _make_nt(self):
+        # ascii except alnum and underscore
+        nochars = ' !"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~'
+        re_clean = _re.compile('[' + _re.escape(nochars) + ']')
+
         def f(s):
-            # NOTE: Python 3 actually allows unicode chars in fields
-            s = _re.sub('[^a-zA-Z0-9_]', '_', s)
+            s = re_clean.sub('_', s)
             # Python identifier cannot start with numbers, namedtuple fields
             # cannot start with underscore. So...
-            if _re.match('^[0-9_]', s):
+            if s[0] == '_' or '0' <= s[0] <= '9':
                 s = 'f' + s
 
             return s
diff --git a/scripts/travis_test.sh b/scripts/travis_test.sh
index 0320654..342e24c 100755
--- a/scripts/travis_test.sh
+++ b/scripts/travis_test.sh
@@ -56,15 +56,15 @@ fi
 # Unsupported postgres versions that we still support
 # Images built by https://github.com/psycopg/psycopg2-wheels/tree/build-dinosaurs
 if [[ -n "$TEST_PAST" ]]; then
-    run_test 7.4
-    run_test 8.0
-    run_test 8.1
-    run_test 8.2
-    run_test 8.3
-    run_test 8.4
-    run_test 9.0
-    run_test 9.1
     run_test 9.2
+    run_test 9.1
+    run_test 9.0
+    run_test 8.4
+    run_test 8.3
+    run_test 8.2
+    run_test 8.1
+    run_test 8.0
+    run_test 7.4
 fi
 
 # Postgres built from master
diff --git a/tests/test_extras_dictcursor.py b/tests/test_extras_dictcursor.py
index 99bdeee..d43980a 100755
--- a/tests/test_extras_dictcursor.py
+++ b/tests/test_extras_dictcursor.py
@@ -19,7 +19,7 @@ from datetime import timedelta
 import psycopg2
 import psycopg2.extras
 import unittest
-from .testutils import ConnectingTestCase, skip_before_postgres
+from .testutils import ConnectingTestCase, skip_before_postgres, skip_before_python
 
 
 class ExtrasDictCursorTests(ConnectingTestCase):
@@ -357,6 +357,14 @@ class NamedTupleCursorTest(ConnectingTestCase):
         self.assertEqual(rv.f_column_, 2)
         self.assertEqual(rv.f3, 3)
 
+    @skip_before_python(3)
+    @skip_before_postgres(8)
+    def test_nonascii_name(self):
+        curs = self.conn.cursor()
+        curs.execute('select 1 as \xe5h\xe9')
+        rv = curs.fetchone()
+        self.assertEqual(getattr(rv, '\xe5h\xe9'), 1)
+
     def test_minimal_generation(self):
         # Instrument the class to verify it gets called the minimum number of times.
         from psycopg2.extras import NamedTupleCursor