Merge branch 'master' into 'orm'

pony/orm/core.py

@@ -1555,11 +1555,11 @@ def describe(attr):
         if attr.args: options.append(', '.join(imap(str, attr.args)))
         if attr.auto: options.append('auto=True')
         if not isinstance(attr, PrimaryKey) and attr.is_unique: options.append('unique=True')
-        if attr.default is not None: options.append('default=%s' % attr.default)
+        if attr.default is not None: options.append('default=%r' % attr.default)
         if not options: options = ''
         else: options = ', ' + ', '.join(options)
         result = "%s(%s%s)" % (attr.__class__.__name__, t, options)
-        return "%s = %s" % (attr.name,result)
+        return "%s = %s" % (attr.name, result)
 
 class Optional(Attribute):
     __slots__ = []

setup.py

@@ -22,6 +22,9 @@
     "Intended Audience :: Developers",
     "License :: Free for non-commercial use",
     "License :: OSI Approved :: GNU Affero General Public License v3",
+    "License :: Other/Proprietary License",
+    "License :: Free For Educational Use",
+    "License :: Free for non-commercial use",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Topic :: Software Development :: Libraries",
@@ -31,7 +34,7 @@
 author = "Alexander Kozlovsky, Alexey Malashkevich"
 author_email = "[email protected]"
 url = "http://ponyorm.com"
-lic = "AGPL"
+lic = "AGPL, Commercial, Free for educational and non-commercial use"
 
 modules = [
     "pony.__init__",