Ticket #12224: diff#1224_withtestcases.diff

django/contrib/auth/management/__init__.py

@@ -4 +4 @@
 
 from django.db.models import get_models, signals
 from django.contrib.auth import models as auth_app
+from django.utils.encoding import force_unicode
 
 def _get_permission_codename(action, opts):
     return u'%s_%s' % (action, opts.object_name.lower())
@@ -25 +26 @@
         ctype = ContentType.objects.get_for_model(klass)
         for codename, name in _get_all_permissions(klass._meta):
             p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id,
-                defaults={'name': name, 'content_type': ctype})
+                defaults={'name': force_unicode(name), 'content_type': ctype})
             if created and verbosity >= 2:
                 print "Adding permission '%s'" % p
 

tests/regressiontests/admin_scripts/tests.py

@@ -12 +12 @@
 from django import conf, bin, get_version
 from django.conf import settings
 
+
+
+
 class AdminScriptTestCase(unittest.TestCase):
     def write_settings(self, filename, apps=None, is_dir=False):
         test_dir = os.path.dirname(os.path.dirname(__file__))
@@ -21 +24 @@
             settings_file = open(os.path.join(settings_dir,'__init__.py'), 'w')
         else:
             settings_file = open(os.path.join(test_dir, filename), 'w')
+            
         settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
         exports = [
             'DATABASE_ENGINE',
@@ -1147 +1151 @@
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',), options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'), ('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None), ('verbosity', '1')]")
+
+
+
+class SyncDB(AdminScriptTestCase):
+    """Test for Parse of Unicode gettext_lazy issue with psycopg
+    """
+
+    def setUp(self):
+        self.write_settings('settings.py')
+
+    def tearDown(self):
+        self.remove_settings('settings.py')
+
+    def test_psyco( self ):
+        "Using gettext_lazy can then calling syncdb will cause an error with psycopg2"
+        args = [ 'syncdb','--settings=settings','--noinput' ]
+        out,err = self.run_django_admin(args)
+        self.assertNoOutput(err)
+
+ 

tests/regressiontests/admin_scripts/models.py

@@ -1 +1 @@
 from django.db import models
+from django.utils.translation import ugettext_lazy
 
 class Article(models.Model):
     headline = models.CharField(max_length=100, default='Default headline')
@@ -9 +10 @@
 
     class Meta:
         ordering = ('-pub_date', 'headline')
-        
- No newline at end of file
+        
+        
+
+# used to test the pyco problem with syndb (SyncDB test class)
+class Person( models.Model ):
+    class Meta:                                  
+        permissions = ( ('can_view_info', ugettext_lazy("Can view info.")), )
+    
+ No newline at end of file