Merge commit 'central/master'

README.txt

@@ -10,8 +10,13 @@ software is intended to demonstrate the GENI Aggregate Manager API.
 Software Dependencies
 =====================
 
+The GCF package is intended to be run on a modern Linux distribution
+(circa 2010 or 2009). Python 2.6 is required. This software is not
+Python 3 compatible.
+
 This software requires a number of readily available software
-packages.
+packages. Most modern Linux distributions should have these packages
+available via their native package management suite (eg. yum or apt).
 
 1. Python M2Crypto package
 

src/client.py

@@ -23,12 +23,19 @@
 # IN THE WORK.
 #----------------------------------------------------------------------
 
+import sys
+
+# Check python version. Requires 2.6 or greater, but less than 3.
+if sys.version_info < (2, 6):
+    raise Exception('Must use python 2.6 or greater.')
+elif sys.version_info >= (3,):
+    raise Exception('Not python 3 ready')
+
 import base64
 import datetime
 import logging
 import optparse
 import random
-import sys
 import xml.dom.minidom as minidom
 import xmlrpclib
 import zlib
@@ -89,7 +96,7 @@ def test_create_sliver(server, slice_urn, slice_credential, dom):
     else:
         # pick two at random
         indices = range(resources.length)
-        for i in range(2):
+        for _ in range(2):
             index = random.choice(indices)
             indices.remove(index)
             top.appendChild(resources.item(index).cloneNode(True))

src/gch.py

@@ -24,6 +24,13 @@
 #----------------------------------------------------------------------
 
 import sys
+
+# Check python version. Requires 2.6 or greater, but less than 3.
+if sys.version_info < (2, 6):
+    raise Exception('Must use python 2.6 or greater.')
+elif sys.version_info >= (3,):
+    raise Exception('Not python 3 ready')
+
 import optparse
 import geni
 

src/init-ca.py

@@ -30,9 +30,16 @@ a clearinghouse and an aggregate manager. Finally, a user cert and
 key is created for a user named Alice.
 """
 
+import sys
+
+# Check python version. Requires 2.6 or greater, but less than 3.
+if sys.version_info < (2, 6):
+    raise Exception('Must use python 2.6 or greater.')
+elif sys.version_info >= (3,):
+    raise Exception('Not python 3 ready')
+
 import optparse
 import os.path
-import sys
 import geni
 import sfa.trust.gid as gid
 import sfa.trust.certificate as cert