Remove whitespace

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

22 files changed, 66 insertions, 75 deletions

diff --git a/src/lib/Server/Hostbase/backends.py b/src/lib/Server/Hostbase/backends.py
index e6c709f35..aa822409c 100644
--- a/src/lib/Server/Hostbase/backends.py
+++ b/src/lib/Server/Hostbase/backends.py
@@ -8,7 +8,7 @@ __revision__ = '$Revision$'
 
 ##     def authenticate(self,username=None,password=None):
 ##         try:
-            
+
 ##             l = ldapauth(username,password)
 ##             temp_pass = User.objects.make_random_password(100)
 ##             ldap_user = dict(username=l.sAMAccountName,
@@ -25,7 +25,7 @@ __revision__ = '$Revision$'
 ##             #print user
 ##             #print "created " + str(created)
 ##             return user
-        
+
 ##         except LDAPAUTHError,e:
 ##             #print str(e)
 ##             return None
@@ -36,7 +36,7 @@ __revision__ = '$Revision$'
 ##         except User.DoesNotExist, e:
 ##             print str(e)
 ##             return None
-    
+
 
 class NISBackend(object):
 
@@ -54,7 +54,7 @@ class NISBackend(object):
                 uid = n.uid
                 )
             user, created = User.objects.get_or_create(username=username)
-            
+
             return user
 
         except NISAUTHError, e:
@@ -66,4 +66,3 @@ class NISBackend(object):
             return User.objects.get(pk=user_id)
         except User.DoesNotExist, e:
             return None
-    
diff --git a/src/lib/Server/Hostbase/hostbase/models.py b/src/lib/Server/Hostbase/hostbase/models.py
index 3d72138c4..3f08a09a0 100644
--- a/src/lib/Server/Hostbase/hostbase/models.py
+++ b/src/lib/Server/Hostbase/hostbase/models.py
@@ -83,7 +83,7 @@ class Interface(models.Model):
     # FIXME: The new admin interface has change a lot.
     #                             radio_admin=True, blank=True)
     dhcp = models.BooleanField()
-    
+
     def __str__(self):
         return self.mac_addr
 
@@ -97,7 +97,7 @@ class IP(models.Model):
     #                              edit_inline=models.TABULAR, num_in_admin=1)
     #ip_addr = models.IPAddressField(core=True)
     ip_addr = models.IPAddressField()
-    
+
     def __str__(self):
         return self.ip_addr
 
@@ -136,7 +136,7 @@ class Name(models.Model):
 
     def __str__(self):
         return self.name
-    
+
     class Admin:
         pass
 
diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Server/Hostbase/hostbase/views.py
index 9768c69c5..ff1d4710d 100644
--- a/src/lib/Server/Hostbase/hostbase/views.py
+++ b/src/lib/Server/Hostbase/hostbase/views.py
@@ -16,7 +16,7 @@ from django.shortcuts import render_to_response
 from django import forms
 from Bcfg2.Server.Hostbase import settings, regex
 import re, copy
-    
+
 attribs = ['hostname', 'whatami', 'netgroup', 'security_class', 'support',
            'csi', 'printq', 'primary_user', 'administrator', 'location',
            'status', 'comments']
@@ -66,7 +66,7 @@ def search(request):
                     querystring += ' AND '
                 querystring += "h.%s LIKE \'%%%%%s%%%%\'" % (field, request.POST[field])
                 _and = True
-               
+
         if not _and:
             cursor = connection.cursor()
             cursor.execute("""SELECT hostname, id, status
@@ -77,7 +77,7 @@ def search(request):
             cursor = connection.cursor()
             cursor.execute(querystring)
             results = cursor.fetchall()
-        
+
         return render_to_response('results.html',
                                   {'hosts': results,
                                    'logged_in': request.session.get('_auth_user_id', False)},
@@ -135,7 +135,7 @@ def edit(request, host_id):
             changename = True
         interfaces = host.interface_set.all()
         old_interfaces = [interface.__dict__.copy() for interface in interfaces]
-            
+
         new_data = request.POST.copy()
 
         errors = manipulator.get_validation_errors(new_data)
@@ -470,7 +470,7 @@ def dnsedit(request, host_id):
                         mx.save()
                     text = do_log(text, '*new*', 'mx',
                                   ' '.join([request.POST['%spriority' % ipaddrstr], request.POST['%smx' % ipaddrstr]]))
-                    name.mxs.add(mx)                
+                    name.mxs.add(mx)
         if text:
             log = Log(hostname=hostdata['host'].hostname, log=text)
             log.save()
@@ -499,7 +499,7 @@ def dnsedit(request, host_id):
                                    'DNS_CHOICES': Name.DNS_CHOICES,
                                    'logged_in': request.session.get('_auth_user_id', False)},
                                    context_instance = RequestContext(request))
-    
+
 def new(request):
     """Function for creating a new host in hostbase
     Data is validated before committed to the database"""
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html
index aeb67587f..8ee143b15 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html
@@ -30,7 +30,7 @@
    <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
    {% else %}
    <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}   
+   {% endifequal %}
    {% endfor %}
    </select>
    </td></tr>
@@ -42,19 +42,19 @@
    <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
    {% else %}
    <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}   
+   {% endifequal %}
    {% endfor %}
    </select>
    </td></tr>
    <tr> <td> <b>class</b></td>
    <td>
-   <select name="security_class">   
+   <select name="security_class">
    {% for choice in CLASS_CHOICES %}
    {% ifequal host.security_class choice.0 %}
    <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
    {% else %}
    <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}   
+   {% endifequal %}
    {% endfor %}
    </select></td></tr>
    <tr> <td> <b>support</b></td>
@@ -65,7 +65,7 @@
    <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
    {% else %}
    <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}   
+   {% endifequal %}
    {% endfor %}
    </select></td></tr>
    <tr> <td> <b>csi</b></td>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
index 9a673cbf0..2b10e5221 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
@@ -75,7 +75,7 @@
 	   {% endfor %}
    	   <tr> <td> <b>name</b></td>
 	   <td> <input name="{{ ip.0.ip_addr }}name" type="text">
-	   <select name="{{ ip.0.ip_addr }}dns_view">	   
+	   <select name="{{ ip.0.ip_addr }}dns_view">
 	   {% for choice in DNS_CHOICES %}
 	   <option value="{{ choice.0 }}">{{ choice.1 }}
 	   {% endfor %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index 8df833821..37cd3e515 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -173,7 +173,7 @@ div#interface{
 <textarea rows="10" cols="50" name="comments">{{ host.comments }}</textarea><br>
 <a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/edit">edit detailed DNS information for this host</a>
 <br>
-this host is 
+this host is
 <select name="status">
 {% for choice in host.STATUS_CHOICES %}
 {% ifequal host.status choice.0 %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 73792e0e0..18054fc9b 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -25,7 +25,7 @@
    <col width="150">
    <col width="*">
    <tr> <td> <b>hostname</b></td>
-   <td> {{ host.hostname }}</td></tr>			 
+   <td> {{ host.hostname }}</td></tr>
    <tr> <td> <b>whatami</b></td>
    <td> {{ host.whatami }}</td></tr>
    <tr> <td> <b>netgroup</b></td>
@@ -67,7 +67,7 @@
    {% endfor %}
    {% endfor %}
    <tr> <td valign="top"> <b>comments</b></td>
-   <td> 
+   <td>
    {{ host.comments|linebreaksbr }}<br>
    </td></tr>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html
index 230d797c5..3f4c32aa1 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html
@@ -24,7 +24,7 @@
    <col width="150">
    <col width="*">
    <tr> <td> <b>hostname</b></td>
-   <td> {{ object.hostname }}</td></tr>			 
+   <td> {{ object.hostname }}</td></tr>	
    <tr> <td> <b>whatami</b></td>
    <td> {{ object.whatami }}</td></tr>
    <tr> <td> <b>netgroup</b></td>
@@ -70,7 +70,7 @@
    {% endfor %}
    {% endfor %}
    <tr> <td valign="top"> <b>comments</b></td>
-   <td> 
+   <td>
    {{ object.comments|linebreaksbr }}<br>
    </td></tr>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
index 1e68de185..92258b648 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
@@ -13,4 +13,4 @@
 {% endblock %}
 {% block content %}
 {% endblock %}
-  
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html
index 91dae7e6d..994f631a8 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html
@@ -10,4 +10,4 @@
 {% endblock %}
 {% block content %}
 {% endblock %}
-  
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
index 5c74197b4..4b4150ea8 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
@@ -40,7 +40,7 @@
    </td></tr>
    <tr> <td> <b>class</b></td>
    <td>
-   <select name="security_class">   
+   <select name="security_class">
    {% for choice in CLASS_CHOICES %}
    <option value="{{ choice.0 }}">{{ choice.1 }}
    {% endfor %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
index 6dfe5aa18..2920a7816 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
@@ -24,7 +24,7 @@
    <col width="150">
    <col width="*">
    <tr> <td> <b>hostname</b></td>
-   <td> {{ host.hostname }}</td></tr>			 
+   <td> {{ host.hostname }}</td></tr>
    <tr> <td> <b>whatami</b></td>
    <td> {{ host.whatami }}</td></tr>
    <tr> <td> <b>netgroup</b></td>
@@ -70,7 +70,7 @@
    {% endfor %}
    {% endfor %}
    <tr> <td valign="top"> <b>comments</b></td>
-   <td> 
+   <td>
    {{ host.comments|linebreaksbr }}<br>
    </td></tr>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
index 59443c00d..c65735f10 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
@@ -23,7 +23,7 @@
    <col width="200">
    <col width="*">
    <tr> <td> <b>zone</b></td>
-   <td> {{ zone.zone }}</td></tr>			 
+   <td> {{ zone.zone }}</td></tr>
    <tr> <td> <b>serial</b></td>
    <td> {{ zone.serial }}</td></tr>
    <tr> <td> <b>admin</b></td>
@@ -61,7 +61,7 @@
    {% endif %}
 
    <tr> <td valign="top"> <b>aux</b></td>
-   <td> 
+   <td>
    {{ zone.aux|linebreaksbr }}
    </td></tr>
 
diff --git a/src/lib/Server/Hostbase/ldapauth.py b/src/lib/Server/Hostbase/ldapauth.py
index 94f5192e0..f2148181f 100644
--- a/src/lib/Server/Hostbase/ldapauth.py
+++ b/src/lib/Server/Hostbase/ldapauth.py
@@ -57,7 +57,7 @@ class ldapauth(object):
         #svc_pass = passwd
 
         search_pth = os.environ['LDAP_SEARCH_PTH']
-        
+
         try:
             conn = ldap.initialize(os.environ['LDAP_URI'])
             conn.bind(svc_acct,svc_pass,ldap.AUTH_SIMPLE)
@@ -69,7 +69,7 @@ class ldapauth(object):
         except ldap.LDAPError,e:
             #connection failed
             return ('error','LDAP connect failed',e,)
-    
+
     def user_bind(self,distinguishedName,passwd):
         """Binds to LDAP Server"""
         search_pth = os.environ['LDAP_SEARCH_PTH']
@@ -127,11 +127,11 @@ class ldapauth(object):
             self.name_l = display_name[0]
             self.is_staff = False
             self.is_superuser = False
-            
+
             return
         except KeyError, e:
             raise LDAPAUTHError("Portions of the LDAP User profile not present")
-        
+
     def member_of(self):
         """See if this user is in our group that is allowed to login"""
         m = [g for g in self.memberOf if g == self.check_member_of]
@@ -147,26 +147,26 @@ class ldapauth(object):
         user = os.environ['LDAP_GROUP_USER']
         m = [g for g in self.memberOf if g == user]
         if len(m) == 1:
-            if level < 1:                       
+            if level < 1:
                 level = 1
 
         cspr = os.environ['LDAP_GROUP_SECURITY_LOW']
         m = [g for g in self.memberOf if g == cspr]
         if len(m) == 1:
-            if level < 2:                       
+            if level < 2:
                 level = 2
 
         cspo = os.environ['LDAP_GROUP_SECURITY_HIGH']
         m = [g for g in self.memberOf if g == cspo]
         if len(m) == 1:
-            if level < 3:                       
+            if level < 3:
                 level = 3
 
         admin = os.environ['LDAP_GROUP_ADMIN']
         m = [g for g in self.memberOf if g == admin]
         if len(m) == 1:
-            if level < 4:                       
+            if level < 4:
                 level = 4
 
         return level
-        
+
diff --git a/src/lib/Server/Hostbase/media/boxypastel.css b/src/lib/Server/Hostbase/media/boxypastel.css
index d7be13147..7ae0684ef 100644
--- a/src/lib/Server/Hostbase/media/boxypastel.css
+++ b/src/lib/Server/Hostbase/media/boxypastel.css
@@ -20,7 +20,6 @@ a:hover {
 }
 a:active {
     color: #00a;
-    
     text-decoration: underline;
 }
 /* divs*/
@@ -43,7 +42,6 @@ div.modified {
     margin-right:50px;
 }
 div.clean {
-    
     border: 1px solid #006600;
     background: #9AFF9A;
     margin: 10px 0;
@@ -102,7 +100,6 @@ div.nodebox {
     position:relative;
 }
 div.header {
-    
     background-color: #DDD;
     padding: 8px;
     text-indent:50px;
@@ -116,7 +113,7 @@ div.header {
 .nodelisttitle {
     font-size: 14px;
 }
-                                        
+
 h2{
     font-size: 16px;
     color: #000;
@@ -130,7 +127,6 @@ ul.plain {
 .notebox {
     position: absolute;
     top: 0px;
-    
     right: 0px;
     padding: 1px;
     text-indent:0px;
@@ -161,8 +157,7 @@ table.sortable a.sortheader {
     font-weight: bold;
     text-decoration: none;
     display: block;
-    
-}  
+}
 table.sortable {
     padding: 2px 4px 2px 4px;
     border: 1px solid #000000;
diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py
index 07577664b..7d5cc6dce 100644
--- a/src/lib/Server/Hostbase/settings.py
+++ b/src/lib/Server/Hostbase/settings.py
@@ -57,7 +57,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 # Uncomment a backend below if you would like to use it for authentication
 AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',
                            'Bcfg2.Server.Hostbase.backends.NISBackend',
-                           #'Bcfg2.Server.Hostbase.backends.LDAPBacken',                           
+                           #'Bcfg2.Server.Hostbase.backends.LDAPBacken',
                            )
 # enter an NIS group name you'd like to give access to edit hostbase records
 AUTHORIZED_GROUP = options['authorized_group']
@@ -70,7 +70,7 @@ django.contrib.auth.LOGIN_URL = '/login'
 MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
 # Just for development
 SERVE_MEDIA = DEBUG
-        
+
 # Language code for this installation. All choices can be found here:
 # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
 # http://blogs.law.harvard.edu/tech/stories/storyReader$15
@@ -123,7 +123,6 @@ TEMPLATE_DIRS = (
     '/usr/share/bcfg2/Hostbase/templates',
     os.path.join(PROJECT_ROOT, 'templates'),
     os.path.join(PROJECT_ROOT, 'hostbase/webtemplates'),
-    
 )
 
 INSTALLED_APPS = (
diff --git a/src/lib/Server/Hostbase/templates/batchadd.tmpl b/src/lib/Server/Hostbase/templates/batchadd.tmpl
index 5f482cb6c..74ea3c047 100644
--- a/src/lib/Server/Hostbase/templates/batchadd.tmpl
+++ b/src/lib/Server/Hostbase/templates/batchadd.tmpl
@@ -1,20 +1,20 @@
-#mx		-> 
-#priority	-> 
+#mx		->
+#priority	->
 
-hostname	-> 
-whatami		-> 
-netgroup	-> 
-security_class	-> 
-support		-> 
+hostname	->
+whatami		->
+netgroup	->
+security_class	->
+support		->
 csi		->
-printq		-> 
-dhcp		-> 
-outbound_smtp	-> 
-primary_user	-> 
-administrator	-> 
-location	-> 
+printq		->
+dhcp		->
+outbound_smtp	->
+primary_user	->
+administrator	->
+location	->
 expiration_date -> YYYY-MM-DD
-comments	-> 
+comments	->
 
 mac_addr	->
 hdwr_type	->
@@ -24,6 +24,6 @@ cname		->
 #cname		->
 
 #mac_addr	->
-#hdwr_type	-> 
+#hdwr_type	->
 #ip_addr	->
 #cname		->
diff --git a/src/lib/Server/Hostbase/templates/dhcpd.tmpl b/src/lib/Server/Hostbase/templates/dhcpd.tmpl
index 309d5f961..757b263cd 100644
--- a/src/lib/Server/Hostbase/templates/dhcpd.tmpl
+++ b/src/lib/Server/Hostbase/templates/dhcpd.tmpl
@@ -1,5 +1,5 @@
 #
-# This file is automatically generated. 
+# This file is automatically generated.
 # DO NOT EDIT IT BY HAND!
 #
 # This file contains {{ numips }} IP addresses
diff --git a/src/lib/Server/Hostbase/templates/named.tmpl b/src/lib/Server/Hostbase/templates/named.tmpl
index eb1b2ddfe..03e054198 100644
--- a/src/lib/Server/Hostbase/templates/named.tmpl
+++ b/src/lib/Server/Hostbase/templates/named.tmpl
@@ -1,7 +1,7 @@
 // This is the primary configuration file for the BIND DNS server named.
 //
-// Please read /usr/share/doc/bind9/README.Debian.gz for information on the 
-// structure of BIND configuration files in Debian, *BEFORE* you customize 
+// Please read /usr/share/doc/bind9/README.Debian.gz for information on the
+// structure of BIND configuration files in Debian, *BEFORE* you customize
 // this configuration file.
 //
 
@@ -66,4 +66,4 @@ zone "{{ reverse.0 }}.in-addr.arpa" {
 // root-delegation-only exclude { "DE"; "MUSEUM"; };
 
 include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.static";
\ No newline at end of file
+include "/etc/bind/named.conf.static";
diff --git a/src/lib/Server/Hostbase/templates/namedviews.tmpl b/src/lib/Server/Hostbase/templates/namedviews.tmpl
index eea2df150..52021620e 100644
--- a/src/lib/Server/Hostbase/templates/namedviews.tmpl
+++ b/src/lib/Server/Hostbase/templates/namedviews.tmpl
@@ -1,7 +1,7 @@
 // This is the primary configuration file for the BIND DNS server named.
 //
-// Please read /usr/share/doc/bind9/README.Debian.gz for information on the 
-// structure of BIND configuration files in Debian, *BEFORE* you customize 
+// Please read /usr/share/doc/bind9/README.Debian.gz for information on the
+// structure of BIND configuration files in Debian, *BEFORE* you customize
 // this configuration file.
 //
 
diff --git a/src/lib/Server/Hostbase/test/test_environ_settings.py b/src/lib/Server/Hostbase/test/test_environ_settings.py
index 606d87f5d..ad35c624e 100644
--- a/src/lib/Server/Hostbase/test/test_environ_settings.py
+++ b/src/lib/Server/Hostbase/test/test_environ_settings.py
@@ -13,7 +13,7 @@ def env_setup():
 
 def teardown():
     pass
-    
+
 def test_environ_settings():
 
     os.environ['bcfg_db_engine'] = 'foo'
diff --git a/src/lib/Server/Hostbase/test/test_settings.py b/src/lib/Server/Hostbase/test/test_settings.py
index 0040b3ab8..0dfc30f38 100644
--- a/src/lib/Server/Hostbase/test/test_settings.py
+++ b/src/lib/Server/Hostbase/test/test_settings.py
@@ -10,5 +10,3 @@ def teardown():
 
 def test_mcs_settings():
     pass
-    
-