Merge pull request #111 from ocefpaf/py3k

Python 3 compatibility and flake8

Author: emiliom

.travis.yml

@@ -1,5 +1,3 @@
-# use http://lint.travis-ci.org/ to check the file.
-
 language: python
 
 sudo: required
@@ -12,7 +10,6 @@ env:
   global:
     - secure: "ckOXS/SsEQGGI6XrdJbEhImPbMyB8HBIqGWJ7CkYKezKTTyuJ510LMAK/7xFLyMQ0rXIrHVpCZsGLsAuzK+h2D0/xQTvkLlxJkTkKwKnm6HKg6fOrbEVSAOzCKYAdP+nBpNLGA/kzMW26E+MSWuFQwc7JiKj36vW9uUgRiT8Knwl9YrfRG+Et1bWJIfbfNoBy2gP3eFXyLBKOcgR0E0y2dyst/uRwkkEn9m8as+PWc3zsVaFS6qf5L4OFMLI5z/EZiNXiu5B/AUvpesWT/OXsbpwnxShska3RXZIh+0exu8euop7Oi4o07PI7EasMtncWzjWKLB6hJaz/BRfS/fjH0/Isy64OUXCIaCwQew31e2uW/liYnlNY/PDJfiVYdbMR34YLLrstCdBjHG+l29eN0VrCKrhW9RDPVW5eKZD1EsQPUgEDpYHaigJBwuAguQ0/MMaZ7Z/DVOR4yUsNlKFO7VwdUL4+lQ3mHrdUAEhuZACncZJ03wouvtyiuGC2WPnPAvk97uHwUcJl7Mq/jTy7HrnTRytHVIHZ8LsymAaGL2ukjVLlJ8ex8/36v2glQEkPAT06f9JXkbWJRzutnDiFKli96shMM17qyl2rjjFdC+fVDm7L7xsgJDAgXAuhD9Wwj3iVo/fcz7SmcH+iEekRtgqwbzaT3MbmLRpS4tOarY="
 
-
 # Removing the directory will remove the env but leave the cached packages
 # at $HOME/miniconda/pkgs. That is a win-win because when re-creating the
 # env we will download only the new packages.
@@ -67,7 +64,6 @@ before_install:
   - conda create --name TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
   - source activate TEST
 
-# Test source distribution.
 install:
   - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install odm2api-${version}.tar.gz && popd
 
@@ -78,7 +74,7 @@ script:
     fi
 
   - if [[ $TEST_TARGET == 'coding_standards' ]]; then
-      find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100 ;
+      find . -type f -name "*.py" ! -name 'conf.py' ! -name '_version.py' ! -name 'versioneer.py' | xargs flake8 --max-line-length=110 ;
     fi
 
   - if [[ $TEST_TARGET == 'docs' ]]; then

Examples/Sample 1.1.py

@@ -1,10 +1,13 @@
-__author__ = 'stephanie'
+from __future__ import (absolute_import, division, print_function)
+
 import sys
 import os
 from odm2api.ODMconnection import dbconnection
 import pprint
 from odm2api.ODM1_1_1.services import SeriesService
 
+__author__ = 'stephanie'
+
 this_file = os.path.realpath(__file__)
 directory = os.path.dirname(this_file)
 sys.path.insert(0, directory)
@@ -92,6 +95,3 @@
     pp.pprint(odm1service.get_values_by_series(ser[0].id))
 
     print "The end"
-
-
-

Examples/Sample.py

@@ -1,6 +1,6 @@
-__author__ = 'stephanie'
-
+from __future__ import (absolute_import, division, print_function)
 
+__author__ = 'stephanie'
 
 #import matplotlib.pyplot as plt
 

Forms/clsDBConfig.py

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
+from __future__ import (absolute_import, division, print_function)
 
 ###########################################################################
 ## Python code generated with wxFormBuilder (version Jun  5 2014)

Forms/frmDBConfig.py

@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """Subclass of clsDBConfiguration, which is generated by wxFormBuilder."""
 
 import wx
@@ -55,7 +57,7 @@ def OnBtnTest(self, event):
 
 
     def OnBtnSave(self, event):
-        
+
         self.parent.EndModal(wx.ID_OK)
 
 

odm2api/ODM2/__init__.py

@@ -1,7 +1,8 @@
-from odm2api.base import serviceBase
-from odm2api.base import modelBase
+from __future__ import (absolute_import, division, print_function)
+
+from odm2api.base import modelBase, serviceBase
 
 __all__ = [
     'serviceBase',
     'modelBase',
-    ]
+]