Random cleanup and comments

config/settings/dev.py

@@ -18,6 +18,7 @@ MIDDLEWARE += [
     debug_middleware,
     #'silk.middleware.SilkyMiddleware',
     #'core.middleware.profiling.ProfileMiddleware',
+    #'core.middleware.admin.AdminsOnlyMiddleware',
 ]
 
 # Add to installed apps

config/urls.py

-
-# Changed for Django 1.11 upgrade
 from django.conf import settings
 from django.conf.urls import url, include
 
-# Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 from django.contrib.auth.views import logout
 from django.views.generic import TemplateView
@@ -11,9 +8,6 @@ from django.views.generic import TemplateView
 # Import feeds
 import core.views
 from events.feeds import EventFeed, feedview
-
-# After Django 1.10, have to import views directly, rather
-# than just using a string
 import events.reports
 import events.views
 from ligoauth.views import pre_login, post_login, shib_logout

gracedb/core/tests/utils.py

@@ -25,7 +25,14 @@ TEST_DATA_DIR = os.path.join('/tmp', 'test_data')
     GRACEDB_DATA_DIR=TEST_DATA_DIR,
 )
 class DefineTestSettings(TestCase):
-    """Defines base settings for testing and creates a data directory"""
+    """
+    Defines base settings for testing and creates a data directory.
+
+    NOTE: we technically should be checking for and creating/deleting
+    settings.GRACEDB_DATA_DIR since we are overriding it.  But we use
+    TEST_DATA_DIR instead just to be totally safe and not accidentally
+    delete all of the real data.
+    """
 
     def setUp(self):
         super(DefineTestSettings, self).setUp()

gracedb/events/context_processors.py

@@ -9,4 +9,4 @@ def LigoAuthContext(request):
         if set(list(internal_groups)) & set(list(request.user.groups.all())):
             user_is_internal = True
 
-    return { 'user' : request.user, 'user_is_internal' : user_is_internal }
+    return {'user': request.user, 'user_is_internal': user_is_internal}

gracedb/ligoauth/middleware.py

@@ -62,7 +62,7 @@ class ShibbolethWebAuthMiddleware(PersistentRemoteUserMiddleware):
 
         # Otherwise, we are seeing this user for the first time in this,
         # session, so we attempt to authenticate the user. The backend will
-        # create user accounts for unknown users (TBD)
+        # create user accounts for unknown users with session information.
         user = auth.authenticate(request, remote_user=username)
 
         # If user not found in database, create user account

gracedb/ligoauth/models.py

@@ -70,12 +70,6 @@ class AlternateEmail(models.Model):
     user = models.ForeignKey(User)
     email = models.EmailField(max_length=254)
 
-def shibid_to_user(shibid):
-    try:
-        return User.objects.get(username=shibid)
-    except User.DoesNotExist:
-        return None
-
 def certdn_to_user(dn, username=None):
     try:
         possible_users = X509Cert.objects.get(subject=dn).users

gracedb/superevents/tests/test_access.py

@@ -82,7 +82,7 @@ class TestSupereventDetailView(SignoffGroupsAndUsersSetup,
     def test_advocate_view_superevent(self):
         """EM advocate user can see advocate signoff form on superevent page"""
 
-        # Apply H1OPS label so we can do a full test
+        # Apply ADVREQ label so we can do a full test
         advreq = Label.objects.create(name='ADVREQ')
         self.internal_superevent.labelling_set.create(label=advreq,
             creator=self.internal_user)