Merge pull request #9 from Pegase745/develop

Allowing to run with python 3.*

Author: Pegase745

.travis.yml

@@ -2,6 +2,8 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
+  - "3.3"
 install:
   - pip install . --use-mirrors
   - pip install -r requirements.txt --use-mirrors

README.rst

@@ -9,7 +9,7 @@ sqlalchemy-datatables |Build Status|
 Usage
 -----
 
-The package is available on `PyPI <https://pypi.python.org/pypi/sqlalchemy-datatables/0.1.5>`_
+The package is available on `PyPI <https://pypi.python.org/pypi/sqlalchemy-datatables/0.1.6>`_
 
 .. code-block:: bash
 
@@ -132,6 +132,12 @@ Testing the Pyramid based ''test-project''
 Changelog
 ---------
 
+**v0.1.6 (16/12/2013)**
+
+
+-  Allow package to run with python 3.*
+-  README modifications
+
 **v0.1.5 (18/10/2013)**
 
 

datatables/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
-__VERSION__ = '0.1.5'
+__VERSION__ = '0.1.6'
 
 from datatables import *

setup.py

@@ -1,9 +1,20 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
-__VERSION__ = [line for line in file('datatables/__init__.py', 'rb') \
-               if line.startswith('__VERSION__')][0].split(\
-               '=')[1].strip().lstrip('\'').rstrip('\'')
+import sys
+
+if sys.version_info >= (3,0):
+    def my_open(path, mode):
+        return open(path, mode, newline='')
+else:
+    def my_open(path, mode):
+        return open(path, mode+'b')
+
+
+__VERSION__ = [line for line in my_open('datatables/__init__.py', 'r') \
+    if line.startswith('__VERSION__')][0].split(\
+    '=')[1].strip().lstrip('\'').rstrip('\'')
+
 
 setup(
     name='sqlalchemy-datatables',
@@ -21,14 +32,21 @@
     install_requires=['sqlalchemy'],
     py_modules=['datatables'],
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Pyramid',
+        'Framework :: Flask',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',

test-project/testproject/models.py

@@ -1,4 +1,7 @@
+from __future__ import absolute_import, unicode_literals 
+
 import datetime, json
+
 from sqlalchemy import (
     Column,
     Integer,
@@ -33,7 +36,7 @@ def __init__(self, name):
         self.name = name
 
     def __str__(self):
-        return u"%s" % self.name
+        return "%s" % self.name
 
     def __repr__(self):
         return '<%s#%s>' % (self.__class__.__name__, self.id)