Support Django 1.8(.3)

backend/backend_daemon.py

@@ -324,10 +324,29 @@ def JoinVessels(*args):
 
     # Raises NodemanagerCommunicationError if it fails.
     return nodemanager.join_vessels(nodehandle, firstvesselname, secondvesselname)
-
 
 
 
+def run_django_setup_using_python_type():
+  """
+  Helper function to run `django.setup` with `__builtins__.type`
+  set to the default Python `type` function (rather than Repy's).
+
+  We need to do this because other code could have imported
+  repy.py and/or safe.py and by this have overridden the built-in
+  `type` function. We need to undo this override temporarily 
+  before running `django.setup()`, and restore it afterwards.
+  (Restoration makes sure that any following Repy code/libraries
+  see the overridden `type` again.)
+  """
+  repy_safe_type = __builtins__.type
+  # safe.py stores a reference to Python's original `type`
+  import safe
+  __builtins__.type = safe._type
+  django.setup()
+  __builtins__.type = repy_safe_type
+
+
 
 def cleanup_vessels():
   """
@@ -337,8 +356,8 @@ def cleanup_vessels():
 
   log.info("[cleanup_vessels] cleanup thread started.")
 
-  # Start a transaction management.
-  django.db.transaction.enter_transaction_management()
+  run_django_setup_using_python_type()
+
 
   # Run forever.
   while True:
@@ -491,6 +510,8 @@ def sync_user_keys_of_vessels():
 
   log.info("[sync_user_keys_of_vessels] thread started.")
 
+  run_django_setup_using_python_type()
+
   # Run forever.
   while True:
 

common/api/maindb.py

@@ -23,9 +23,7 @@
   We try to keep all manual transaction management in clearinghouse to within
   this module. The general idea is that the default behavior of django is
   what we want in most places (to commit any time data-altering functions
-  are called, such as .save() or .delete()). However, in a few cases we
-  want multiple data-altering functions to be committed atomically, so we
-  use @transaction.commit_manually.
+  are called, such as .save() or .delete()).
 """
 
 # It is a bit confusing to just import datetime because then you have to use
@@ -159,7 +157,6 @@ def init_maindb():
 
 
 
-@transaction.commit_manually
 @log_function_call_and_only_first_argument
 def create_user(username, password, email, affiliation, user_pubkey, user_privkey, donor_pubkey):
   """
@@ -219,21 +216,22 @@ def create_user(username, password, email, affiliation, user_pubkey, user_privke
   # We're committing manually to make sure the multiple database writes are
   # atomic. (That is, regenerate_api_key() will do a database write.)
   try:
-    # Generate a random port for the user's usable vessel port.
-    port = random.sample(ALLOWED_USER_PORTS, 1)[0]
-
-    # Create the GeniUser (this is actually records in two different tables
-    # underneath because of model inheretance, but django hides that from us).
-    geniuser = GeniUser(username=username, password='', email=email,
-                        affiliation=affiliation, user_pubkey=user_pubkey,
-                        user_privkey=user_privkey, donor_pubkey=donor_pubkey,
-                        usable_vessel_port=port,
-                        free_vessel_credits=DEFAULT_FREE_VESSEL_CREDITS)
-    # Set the password using this function so that it gets hashed by django.
-    geniuser.set_password(password)
-    geniuser.save()
-
-    regenerate_api_key(geniuser)
+      with transaction.atomic():
+          # Generate a random port for the user's usable vessel port.
+          port = random.sample(ALLOWED_USER_PORTS, 1)[0]
+
+          # Create the GeniUser (this is actually records in two different tables
+          # underneath because of model inheretance, but django hides that from us).
+          geniuser = GeniUser(username=username, password='', email=email,
+                              affiliation=affiliation, user_pubkey=user_pubkey,
+                              user_privkey=user_privkey, donor_pubkey=donor_pubkey,
+                              usable_vessel_port=port,
+                              free_vessel_credits=DEFAULT_FREE_VESSEL_CREDITS)
+          # Set the password using this function so that it gets hashed by django.
+          geniuser.set_password(password)
+          geniuser.save()
+
+          regenerate_api_key(geniuser)
 
   except:
     transaction.rollback()
@@ -575,7 +573,6 @@ def create_vessel(node, vesselname):
 
 
 
-@transaction.commit_manually
 @log_function_call
 def set_vessel_ports(vessel, port_list):
   """
@@ -604,13 +601,14 @@ def set_vessel_ports(vessel, port_list):
   # We're committing manually to make sure the multiple database writes are
   # atomic.
   try:
-    # Delete all existing VesselPort records for this vessel.
-    VesselPort.objects.filter(vessel=vessel).delete()
-
-    # Create a VesselPort record for each port in port_list.
-    for port in port_list:
-      vesselport = VesselPort(vessel=vessel, port=port)
-      vesselport.save()
+      with transaction.atomic():
+        # Delete all existing VesselPort records for this vessel.
+        VesselPort.objects.filter(vessel=vessel).delete()
+
+        # Create a VesselPort record for each port in port_list.
+        for port in port_list:
+          vesselport = VesselPort(vessel=vessel, port=port)
+          vesselport.save()
 
   except:
     transaction.rollback()

node_state_transitions/node_transition_lib.py

@@ -65,6 +65,18 @@
 
 from clearinghouse.website import settings
 
+# Beginning of part of fix for Issue #152
+# Perform django setup (required in Django 1.7+ (possibly 1.6.?+)) to make
+# db/models available. We need to do this if we are using a django version
+# that has django.setup() (1.7+?) This should happen before the repy patching
+# of builtins, which likely occurs in the add_dy_support call in the next line
+# of code. django.setup() expects to be able to use the builtin keyword
+# 'type', which is patched by repy, so we should do this here, before that
+# patching.
+if hasattr(django, 'setup'):
+  django.setup()
+# end of Issue #152 fix
+
 # Import all the repy files.
 add_dy_support(locals())
 

polling/check_active_db_nodes.py

@@ -65,6 +65,9 @@ def main():
 
   lockserver_handle = lockserver.create_lockserver_handle()
 
+  django.setup()
+
+
   # Always try to release the lockserver handle, though it's probably not
   # very useful in this case.
   try:

website/control/admin.py

@@ -7,6 +7,7 @@
 
 <Author>
   Justin Samuel
+  Sai Kaushik Borra
 
 <Purpose>
   This module provides classes that tell django how to represent the models
@@ -17,14 +18,15 @@
 
 from clearinghouse.common.api import maindb
 
-from clearinghouse.website.control.models import Donation
-from clearinghouse.website.control.models import GeniUser
-from clearinghouse.website.control.models import Node
-from clearinghouse.website.control.models import Vessel
-from clearinghouse.website.control.models import VesselPort
-from clearinghouse.website.control.models import VesselUserAccessMap
-from clearinghouse.website.control.models import ActionLogEvent
-from clearinghouse.website.control.models import ActionLogVesselDetails
+from models import Donation
+from models import GeniUser
+from models import Node
+from models import Vessel
+from models import VesselPort
+from models import VesselUserAccessMap
+from models import ActionLogEvent
+from models import ActionLogVesselDetails
+
 
 from django.contrib import admin
 from django.contrib.auth.forms import AdminPasswordChangeForm
@@ -244,3 +246,4 @@ class ActionLogVesselDetailsAdmin(admin.ModelAdmin):
 admin.site.register(VesselUserAccessMap, VesselUserAccessMapAdmin)
 admin.site.register(ActionLogEvent, ActionLogEventAdmin)
 admin.site.register(ActionLogVesselDetails, ActionLogVesselDetailsAdmin)
+

website/control/models.py

@@ -7,6 +7,7 @@
 
 <Author>
   Justin Samuel
+  Sai Kaushik Borra
 
 <Purpose>
   This file contains definitions of model classes for the main database
@@ -31,7 +32,6 @@
 
 
 
-
 # First, we want to register a signal. This page recommends putting this code
 # in models.py: http://docs.djangoproject.com/en/dev/topics/signals/
 
@@ -40,17 +40,10 @@ def _prepare_newly_created_db_connection(sender, **kwargs):
   from clearinghouse.common.api import maindb
   maindb.init_maindb()
 
-# If this is a modern-enough version of django to support specifying a function
-# to be called on database connection creation, then have it call init_maindb()
-# at that time. This is to help prevent init_maindb() from accidentally not
-# being called when it should be.
-if django.VERSION >= (1,1):
-  # connection_created only exists with django >= 1.1
-  import django.db.backends.signals
-  django.db.backends.signals.connection_created.connect(_prepare_newly_created_db_connection)
-else:
-  log.error("You must use django >= 1.1 in order to support automatically " +
-            "perform custom database connection initialization. (See settings.py)")
+# Call init_maindb() on database connection creation. This is to help prevent
+# init_maindb() from accidentally not being called when it should be.
+import django.db.backends.signals
+django.db.backends.signals.connection_created.connect(_prepare_newly_created_db_connection)
 
 
 
@@ -60,7 +53,7 @@ def _prepare_newly_created_db_connection(sender, **kwargs):
 class GeniUser(DjangoUser):
   """
   Defines the GeniUser model. A GeniUser record represents a SeattleGeni user.
-  
+
   By extending the DjangoUser model, django will still create a separate table
   in the database for the GeniUser model but will take care of making it look
   the same to us.

website/html/forms.py

@@ -11,14 +11,22 @@
 
   Jason Chen
   [email protected]
+
+  Sai Kaushik Borra
+  [email protected]
 <Purpose>
 
 <Usage>
   For more information on forms in django see:
   http://docs.djangoproject.com/en/dev/topics/forms/
 """
+
+
 from clearinghouse.website.control.models import GeniUser
 
+# from control.models import GeniUser, Sensor, SensorAttribute, ExperimentInfo, ExperimentSensor, ExperimentSensorAttribute
+
+
 from django.contrib.auth.forms import UserCreationForm as DjangoUserCreationForm
 import django.forms as forms
 
@@ -30,6 +38,7 @@
 MAX_PUBKEY_UPLOAD_SIZE = 2048
 
 class PubKeyField(forms.FileField):
+
   def clean(self,value,initial):
     forms.FileField.clean(self,value,initial)
     if value is None:
@@ -46,6 +55,8 @@ def clean(self,value,initial):
 
 
 
+
+
 class GeniUserCreationForm(DjangoUserCreationForm):
 
   affiliation = forms.CharField(error_messages={'required': 'Enter an Affiliation'})
@@ -95,8 +106,7 @@ def clean_email(self):
 
 
 
-
-def gen_edit_user_form(field_list=None, *args, **kwargs):
+def gen_edit_user_form(field_list='__all__', *args, **kwargs):
   """
   <Purpose>
       Dynamically generates a EditUserForm depending on field_list.

website/html/templates/accounts/accounts_base.html

@@ -58,7 +58,9 @@
 				  {% endblock nav_login %}
 
 				  {% block nav_register %}
+
 				  <td><a href="{% url 'register' %}">Register</a></td>
+
 				  {% endblock nav_register %}
 
 				  {% block nav_help %}

website/html/templates/accounts/register.html

@@ -10,6 +10,10 @@
 
   Modified:
   Gaetano Pressimone 2012
+
+
+  Sai Kaushik Borra 2015
+
 
 <Purpose>
   Django template file for {{ TESTBED }} {{ CLEARINGHOUSE }}'s 'register' page.  The page 
@@ -27,6 +31,7 @@
 
 <Template Variables>
   page_top_errors:
+
 		Error messages to display.
 
   form: 
@@ -36,6 +41,7 @@
 		.password2: 
     .affiliation:  
 		.email:  
+
     .pubkey:  
     .gen_upload_choice: 
 
@@ -54,6 +60,7 @@
 {% endblock nav_register %}
 
 {% block content %}
+
 	<div id="main">
 		<div id="middle">
 
@@ -125,3 +132,4 @@
 		</div>
 	</div>
 {% endblock content %}
+

website/html/templates/common/installers.html

@@ -28,7 +28,7 @@
 						<a href="{% url 'mac_installer' username %}">Download installer for Mac</a>
 						<p>
 							<strong>Instructions:</strong>
-							<br />(Note: You must have Python 2.5 installed)
+							<br />(Note: You must have Python 2.5, 2.6, or 2.7 installed)
 						</p>
 						<ol>
 							<li>Download the {{ TESTBED }} tarball to your computer</li>
@@ -61,7 +61,7 @@
 						<a href="{% url 'linux_installer' username %}">Download installer for Linux</a>
 						<p>
 							<strong>Instructions:</strong>
-							<br />(Note: You must have Python 2.5 installed)
+							<br />(Note: You must have Python 2.5, 2.6, or 2.7 installed)
 						</p>
 						<ol>
 							<li>Download the {{ TESTBED }} tarball to your computer</li>