Merge pull request #5 from uw-it-aca/develop

use a single Grad_DAO

.travis.yml

@@ -2,18 +2,16 @@ sudo: false
 language: python
 python:
 - '2.7'
-- '3.4'
-- '3.5'
 - '3.6'
 before_script:
 - pip install -e .
-- pip install pep8
+- pip install pycodestyle
 - pip install nose2
 - pip install coverage
 - pip install commonconf
 - pip install python-coveralls
 script:
-- pep8 uw_grad/ --exclude=uw_grad/tests
+- pycodestyle uw_grad/ --exclude=uw_grad/tests
 - coverage run --source=uw_grad uw_grad/test.py -v
 after_script:
 - coveralls

setup.py

@@ -22,7 +22,7 @@
     author_email="aca-it@uw.edu",
     include_package_data=True,
     install_requires=['UW-RestClients-Core<1.0',
-                      'UW-RestClients-PWS<1.0',
+                      'UW-RestClients-PWS<2.0,>=1.0.1',
                       'python-dateutil'
                       ],
     license='Apache License, Version 2.0',

uw_grad/__init__.py

@@ -4,16 +4,18 @@
 
 import logging
 from dateutil.parser import parse
+from uw_pws import PWS
 from uw_grad.dao import Grad_DAO
 from restclients_core.exceptions import DataFailureException
 
 
 logger = logging.getLogger(__name__)
+DAO = Grad_DAO()
+UWPWS = PWS()
 
 
 def get_resource(url):
-    dao = Grad_DAO()
-    response = dao.getURL(url, {})
+    response = DAO.getURL(url, {})
     logger.info("%s ==status==> %s" % (url, response.status))
 
     if response.status != 200:

uw_grad/committee.py

@@ -4,8 +4,7 @@
 import logging
 import json
 from uw_grad.models import GradCommitteeMember, GradCommittee
-from uw_pws import PWS
-from uw_grad import get_resource, parse_datetime
+from uw_grad import get_resource, parse_datetime, UWPWS
 
 
 PREFIX = "/services/students/v1/api/committee?id="
@@ -19,7 +18,7 @@ def get_committee_by_regid(regid):
     """
     raise: InvalidRegID, DataFailureException
     """
-    person = PWS().get_person_by_regid(regid)
+    person = UWPWS.get_person_by_regid(regid)
     return get_committee_by_syskey(person.student_system_key)
 
 

uw_grad/degree.py

@@ -4,8 +4,7 @@
 import logging
 import json
 from uw_grad.models import GradDegree
-from uw_pws import PWS
-from uw_grad import get_resource, parse_datetime
+from uw_grad import get_resource, parse_datetime, UWPWS
 
 
 PREFIX = "/services/students/v1/api/request?id="
@@ -19,7 +18,7 @@ def get_degree_by_regid(regid):
     """
     raise: InvalidRegID, DataFailureException
     """
-    person = PWS().get_person_by_regid(regid)
+    person = UWPWS.get_person_by_regid(regid)
     return get_degree_by_syskey(person.student_system_key)
 
 

uw_grad/leave.py

@@ -4,8 +4,7 @@
 import logging
 import json
 from uw_grad.models import GradLeave, GradTerm
-from uw_pws import PWS
-from uw_grad import get_resource, parse_datetime
+from uw_grad import get_resource, parse_datetime, UWPWS
 
 
 PREFIX = "/services/students/v1/api/leave?id="
@@ -18,7 +17,7 @@ def get_leave_by_regid(regid):
     """
     raise: InvalidRegID, DataFailureException
     """
-    person = PWS().get_person_by_regid(regid)
+    person = UWPWS.get_person_by_regid(regid)
     return get_leave_by_syskey(person.student_system_key)
 
 

uw_grad/petition.py

@@ -4,8 +4,7 @@
 import logging
 import json
 from uw_grad.models import GradPetition
-from uw_pws import PWS
-from uw_grad import get_resource, parse_datetime
+from uw_grad import get_resource, parse_datetime, UWPWS
 
 
 PREFIX = "/services/students/v1/api/petition?id="
@@ -18,7 +17,7 @@ def get_petition_by_regid(regid):
     """
     raise: InvalidRegID, DataFailureException
     """
-    person = PWS().get_person_by_regid(regid)
+    person = UWPWS.get_person_by_regid(regid)
     return get_petition_by_syskey(person.student_system_key)