py33 tests fixed

Some requirements were updated to py33 compiliant versions.
Also imports were modified according to py33 compatibility.
https://storyboard.openstack.org/#!/story/117

Change-Id: I4422f1bcfb02fd27b0c275ef58b19fdfb386cd17

.testr.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./refstack -s ./refstack/tests $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list

refstack/admin.py

@@ -2,11 +2,11 @@
 import flask
 from flask.ext.admin.contrib import sqla
 
-from refstack import models
+import models
 
 # Global admin object
-from .extensions import admin
+from refstack.extensions import admin
-from .extensions import db
+from refstack.extensions import db
 
 
 class SecureView(sqla.ModelView):

refstack/api.py

@@ -23,7 +23,7 @@ Flask-Restful later on.
 import flask
 from flask.ext import restless
 
-from refstack import models
+import models
 from refstack.extensions import api
 
 

refstack/app.py

@@ -15,11 +15,11 @@
 #
 import os
 from flask import Flask, render_template
-from .config import DefaultConfig
+from refstack.config import DefaultConfig
-from refstack import admin
+import admin
-from refstack import api
+import api
-from .extensions import db
+from refstack.extensions import db
-from .extensions import oid
+from refstack.extensions import oid
 
 
 from refstack import utils
@@ -66,7 +66,7 @@ def create_app(config=None, app_name=None, blueprints=None):
     configure_error_handlers(app)
 
     if app.debug:
-        print utils.dump_config(app)
+        print(utils.dump_config(app))
 
     return app
 

refstack/models.py

@@ -16,7 +16,7 @@
 
 from datetime import datetime
 
-from .extensions import db
+from refstack.extensions import db
 
 
 class User(db.Model):

refstack/utils.py

@@ -115,7 +115,7 @@ def make_dir(dir_path):
     try:
         if not os.path.exists(dir_path):
             os.mkdir(dir_path)
-    except Exception, e:
+    except Exception as e:
         raise e
 
 
@@ -124,4 +124,4 @@ def make_dir(dir_path):
 
 def dump_config(app):
     """Useful to dump app config for debug purposes."""
-    return pprint.pformat(dict(app.config.iteritems()))
+    return pprint.pformat(dict(app.config.items()))

requirements.txt

@@ -1,16 +1,16 @@
 Flask==0.10.1
 Flask-Admin==1.0.7
-Flask-Login==0.1.3
+Flask-Login==0.2.11
-Flask-Mail==0.8.2
+Flask-Mail==0.9.0
-Flask-OpenID==1.1.1
+Flask-OpenID==1.2.1
 Flask-Principal==0.3.5
 Flask-SQLAlchemy==1.0
 Flask-Security==1.6.3
 Flask-WTF==0.8.3
-Flask-Restless==0.12.0
+Flask-Restless==0.13.1
 SQLAlchemy==0.8.3
 WTForms==1.0.4
-Werkzeug==0.8.3
+Werkzeug==0.9.6
 alembic==0.5.0
 gunicorn==0.17.4
 pyOpenSSL==0.13

tox.ini

@@ -1,5 +1,8 @@
 [tox]
-envlist = py27,py33,pep8
+# py33 tests should be runned before py27
+# it is a workaround for testr bug
+# https://bugs.launchpad.net/testrepository/+bug/1229445
+envlist = py33,py27,pep8
 minversion = 1.6
 skipsdist = True