Make evote a module and only worry about wsgi.

I am now handling fcgi-related stuff elsewhere in a dispatcher.
This allows us to focus on just the app and not the web integration
around it.

Author: mtahmed

.htaccess

@@ -1,21 +1,16 @@
-#!/users/mtahmed/bin/python
-
-import sys
-sys.path.append('/users/mtahmed/.local/lib/python3.3/site-packages')
-
 from pyramid.config   import Configurator
 from pyramid.response import Response
 from pyramid.view     import view_config
 
-import auth
+from . import auth
 
 @view_config(route_name='main', renderer='templates/base.jinja2')
 def main(request):
     '''View for the main landing page.
     '''
     template_data = dict()
 
-    a = auth.Auth()
+    a = auth.Auth(user_id=request.remote_user)
     template_data['user_id'] = a.get_user_id()
 
     return template_data
@@ -24,12 +19,12 @@ def main(request):
 def logout(request):
     '''View for the logout page. Only redirects to the logout page.
     '''
-    a = auth.Auth()
+    a = auth.Auth(user_id=request.remote_user)
     response = Response()
 
     return a.logout(response)
 
-def make_evote_app():
+def make_wsgi_app():
     '''This function returns a Pyramid WSGI application.
     '''
     config = Configurator()
@@ -45,8 +40,3 @@ def make_evote_app():
     config.include('pyramid_jinja2')
 
     return config.make_wsgi_app()
-
-if __name__ == '__main__':
-    import wsgiref.handlers
-    app = make_evote_app()
-    wsgiref.handlers.CGIHandler().run(make_evote_app())

index.py __init__.py

@@ -1,17 +1,15 @@
-import os
-
 class Auth:
     '''This class will provide the voter authentication.
 
     Right now it uses the uWaterloo CAS to provide authentication.
     '''
     CAS_LOGOUT_URL='https://cas.uwaterloo.ca/cas/logout'
 
-    def __init__(self):
-        self.user_id = os.environ['REMOTE_USER']
+    def __init__(self, user_id, is_authed=True):
+        self.user_id = user_id
         # The user is denied if auth fails before they get here so the user must
         # already be authenticated.
-        self.is_authed = True
+        self.is_authed = is_authed
 
     def get_user_id(self):
         return self.user_id