Merge branch 'django-1.5' into maint

author: Sol Jerome <sol.jerome@gmail.com> 2013-06-05 10:43:43 -0500
committer: Sol Jerome <sol.jerome@gmail.com> 2013-06-05 10:43:43 -0500
commit: 8d561f220c29278b2e81484a38bc12d729baa701 (patch)
tree: 0b5db1b4001c2505de254e3b0e7f81563f6f1818 /src/lib
parent: 484d8100cdcdfa316cbf9568928697044cc331b8 (diff)
parent: fd993228d36c166593285a8ebbd2e6fb45c36d4d (diff)
download: bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.tar.gz
bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.tar.bz2
bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.zip
14 files changed, 123 insertions, 77 deletions
diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html
index c73339911..7f1fcba3b 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -1,4 +1,8 @@
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -25,8 +29,9 @@
 
   <div id="header">
     <a href="http://bcfg2.org"><img src='{% to_media_url bcfg2_logo.png %}'
-		height='115' width='300' alt='Bcfg2' style='float:left; height: 115px' /></a>
-	</div>
+                                    height='115' width='300' alt='Bcfg2'
+                                    style='float:left; height: 115px' /></a>
+  </div>
 
 <div id="document">
   <div id="content"><div id="contentwrapper">
@@ -46,26 +51,26 @@
       <li>Overview</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_summary %}">Summary</a></li>
-      <li><a href="{% url reports_history %}">Recent Interactions</a></li>
-      <li><a href="{% url reports_timing %}">Timing</a></li>
+      <li><a href="{% url "reports_summary" %}">Summary</a></li>
+      <li><a href="{% url "reports_history" %}">Recent Interactions</a></li>
+      <li><a href="{% url "reports_timing" %}">Timing</a></li>
     </ul>
     <ul class='menu-level1'>
       <li>Clients</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_grid_view %}">Grid View</a></li>
-      <li><a href="{% url reports_detailed_list %}">Detailed List</a></li>
-      <li><a href="{% url reports_client_manage %}">Manage</a></li>
+      <li><a href="{% url "reports_grid_view" %}">Grid View</a></li>
+      <li><a href="{% url "reports_detailed_list" %}">Detailed List</a></li>
+      <li><a href="{% url "reports_client_manage" %}">Manage</a></li>
     </ul>
     <ul class='menu-level1'>
       <li>Entries Configured</li>
     </ul>
     <ul class='menu-level2'>
-      <li><a href="{% url reports_common_problems %}">Common problems</a></li>
-      <li><a href="{% url reports_item_list "bad" %}">Bad</a></li>
-      <li><a href="{% url reports_item_list "modified" %}">Modified</a></li>
-      <li><a href="{% url reports_item_list "extra" %}">Extra</a></li>
+      <li><a href="{% url "reports_common_problems" %}">Common problems</a></li>
+      <li><a href="{% url "reports_item_list" "bad" %}">Bad</a></li>
+      <li><a href="{% url "reports_item_list" "modified" %}">Modified</a></li>
+      <li><a href="{% url "reports_item_list" "extra" %}">Extra</a></li>
     </ul>
 {% comment %}
  TODO
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detail.html b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
index 4608ce6f1..e890589a7 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detail.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
@@ -1,24 +1,28 @@
 {% extends "base.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Client {{client.name}}{% endblock %}
 
 {% block extra_header_info %}
 <style type="text/css">
 .node_data {
-	border: 1px solid #98DBCC;
-	margin: 10px;
-	padding-left: 18px;
+    border: 1px solid #98DBCC;
+    margin: 10px;
+    padding-left: 18px;
 }
 .node_data td {
-	padding: 1px 20px 1px 2px;
+    padding: 1px 20px 1px 2px;
 }
 span.history_links {
-	font-size: 90%;
-	margin-left: 50px;
+    font-size: 90%;
+    margin-left: 50px;
 }
 span.history_links a {
-	font-size: 90%;
+    font-size: 90%;
 }
 </style>
 {% endblock %}
@@ -30,12 +34,12 @@ span.history_links a {
 {% block content %}
   <div class='detail_header'>
     <h2>{{client.name}}</h2>
-    <a href='{% url reports_client_manage %}#{{ client.name }}'>[manage]</a>
-  <span class='history_links'><a href="{% url reports_client_history client.name %}">View History</a> | Jump to&nbsp;
+    <a href='{% url "reports_client_manage" %}#{{ client.name }}'>[manage]</a>
+  <span class='history_links'><a href="{% url "reports_client_history" client.name %}">View History</a> | Jump to&nbsp;
     <select id="quick" name="quick" onchange="javascript:pageJump('quick');">
     <option value="" selected="selected">--- Time ---</option>
     {% for i in client.interactions.all|slice:":25" %}
-        <option value="{% url reports_client_detail_pk hostname=client.name, pk=i.id %}">{{i.timestamp|date:"c"}}</option>
+        <option value="{% url "reports_client_detail_pk" hostname=client.name pk=i.id %}">{{i.timestamp|date:"c"}}</option>
     {% endfor %}
   </select></span>
   </div>
@@ -110,7 +114,7 @@ span.history_links a {
       {% for entry in entry_list %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td class='entry_list_type'>{{entry.entry_type}}</td>
-          <td><a href="{% url reports_item entry.class_name entry.pk interaction.pk %}">
+          <td><a href="{% url "reports_item" entry.class_name entry.pk interaction.pk %}">
               {{entry.name}}</a></td>
         </tr>
       {% endfor %}
@@ -129,7 +133,7 @@ span.history_links a {
       {% for failure in interaction.failures.all %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td class='entry_list_type'>{{failure.entry_type}}</td>
-          <td><a href="{% url reports_item failure.class_name failure.pk interaction.pk %}">
+          <td><a href="{% url "reports_item" failure.class_name failure.pk interaction.pk %}">
               {{failure.name}}</a></td>
         </tr>
       {% endfor %}
@@ -140,11 +144,11 @@ span.history_links a {
   {% if entry_list %}
   <div class="entry_list recent_history_wrapper">
     <div class="entry_list_head" style="border-bottom: 2px solid #98DBCC;">
-      <h4 style="display: inline"><a href="{% url reports_client_history client.name %}">Recent Interactions</a></h4>
+      <h4 style="display: inline"><a href="{% url "reports_client_history" client.name %}">Recent Interactions</a></h4>
     </div>
     <div class='recent_history_box'>
       {% include "widgets/interaction_list.inc" %}
-      <div style='padding-left: 5px'><a href="{% url reports_client_history client.name %}">more...</a></div>
+      <div style='padding-left: 5px'><a href="{% url "reports_client_history" client.name %}">more...</a></div>
     </div>
   </div>
   {% endif %}
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
index fd9a545ce..33c78a5f0 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Detailed Client Listing{% endblock %}
 {% block pagebanner %}Clients - Detailed View{% endblock %}
@@ -21,7 +25,7 @@
   </tr>
   {% for entry in entry_list %}
   <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url Bcfg2.Reporting.views.client_detail hostname=entry.client.name, pk=entry.id %}'>{{ entry.client.name }}</a></td>
+    <td class='left_column'><a href='{% url "Bcfg2.Reporting.views.client_detail" hostname=entry.client.name pk=entry.id %}'>{{ entry.client.name }}</a></td>
     <td class='right_column' style='width:75px'><a href='{% add_url_filter state=entry.state %}'
       class='{{entry|determine_client_state}}'>{{ entry.state }}</a></td>
     <td class='right_column_narrow'>{{ entry.good_count }}</td>
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/index.html b/src/lib/Bcfg2/Reporting/templates/clients/index.html
index d9c415c20..eba83670b 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/index.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/index.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block extra_header_info %}
 {% endblock%}
@@ -17,9 +21,9 @@
       <td class='{{ inter|determine_client_state }}'>
           <a href="{% spaceless %}
               {% if not timestamp %}
-                  {% url reports_client_detail inter.client.name %}
+                  {% url "reports_client_detail" inter.client.name %}
               {% else %}
-                  {% url reports_client_detail_pk inter.client.name,inter.id %}
+                  {% url "reports_client_detail_pk" inter.client.name inter.id %}
               {% endif %}
               {% endspaceless %}">{{ inter.client.name }}</a>
       </td>
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/manage.html b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
index 443ec8ccb..03918aad7 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/manage.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
@@ -1,4 +1,8 @@
 {% extends "base.html" %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block extra_header_info %}
 {% endblock%}
@@ -24,10 +28,10 @@
       <td><span id="{{ client.name }}"> </span>
           <span id="ttag-{{ client.name }}"> </span>
           <span id="s-ttag-{{ client.name }}"> </span>
-          <a href="{% url reports_client_detail client.name %}">{{ client.name }}</a></td>
+          <a href='{% url "reports_client_detail" client.name %}'>{{ client.name }}</a></td>
       <td>{% firstof client.expiration 'Active' %}</td>
       <td>
-          <form method="post" action="{% url reports_client_manage %}">
+          <form method="post" action='{% url "reports_client_manage" %}'>
             <div> {# here for no reason other then to validate #}
               <input type="hidden" name="client_name" value="{{ client.name }}" />
               <input type="hidden" name="client_action" value="{% if client.expiration %}unexpire{% else %}expire{% endif %}" />
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/common.html b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
index 57191ec39..91f37d7dc 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/common.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
@@ -1,5 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Common Problems{% endblock %}
 
@@ -29,9 +30,9 @@
       {% for item in type_list %}
         <tr class='{% cycle listview,listview_alt %}'>
           <td>{{ item.ENTRY_TYPE }}</td>
-          <td><a href="{% url reports_entry item.class_name, item.pk %}">{{ item.name }}</a></td>
+          <td><a href='{% url "reports_entry" item.class_name  item.pk %}'>{{ item.name }}</a></td>
           <td>{{ item.num_entries }}</td>
-          <td><a href="{% url reports_item item.ENTRY_TYPE, item.pk %}">{{ item.short_list|join:"," }}</a></td>
+          <td><a href='{% url "reports_item" item.ENTRY_TYPE  item.pk %}'>{{ item.short_list|join:"," }}</a></td>
         </tr>
       {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
index e940889ab..e3befb0eb 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Entry Status{% endblock %}
 
@@ -17,10 +21,10 @@
         {% for item, inters in items %}
           {% for inter in inters %}
           <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href='{% url reports_client_detail hostname=inter.client.name %}'>{{inter.client.name}}</a></td>
-            <td><a href='{% url reports_client_detail_pk hostname=inter.client.name, pk=inter.pk %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
+            <td><a href='{% url "reports_client_detail" hostname=inter.client.name %}'>{{inter.client.name}}</a></td>
+            <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.pk %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
             <td>{{ item.get_state_display }}</td>
-            <td style='white-space: nowrap'><a href="{% url reports_item entry_type=item.class_name pk=item.pk %}">({{item.pk}}) {{item.short_list|join:","}}</a></td>
+            <td style='white-space: nowrap'><a href='{% url "reports_item" entry_type=item.class_name pk=item.pk %}'>({{item.pk}}) {{item.short_list|join:","}}</a></td>
           </tr>
           {% endfor %}
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
index 259414399..b03d48045 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% load split %}
 {% load syntax_coloring %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 
 {% block title %}Bcfg2 - Element Details{% endblock %}
@@ -9,20 +13,20 @@
 {% block extra_header_info %}
 <style type="text/css">
 #table_list_header {
-	font-size: 100%;
+    font-size: 100%;
 }
 table.entry_list {
-        width: auto;
+    width: auto;
 }
 div.information_wrapper {
-	margin: 15px;
+    margin: 15px;
 }
 div.diff_wrapper {
-	overflow: auto;
+    overflow: auto;
 }
 div.entry_list h3 {
-	font-size: 90%;
-	padding: 5px;
+    font-size: 90%;
+    padding: 5px;
 }
 </style>
 {% endblock%}
@@ -131,9 +135,9 @@ div.entry_list h3 {
     {% if associated_list %}
       <table class="entry_list" cellpadding="3">
         {% for inter in associated_list %}
-          <tr><td><a href="{% url reports_client_detail inter.client.name %}"
+          <tr><td><a href='{% url "reports_client_detail" inter.client.name %}'
               >{{inter.client.name}}</a></td>
-          <td><a href="{% url reports_client_detail_pk hostname=inter.client.name,pk=inter.id %}"
+          <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.id %}'
               >{{inter.timestamp}}</a></td>
           </tr>
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
index 864392754..0e4812e85 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Element Listing{% endblock %}
 
@@ -21,9 +25,9 @@
         <tr style='text-align: left' ><th>Name</th><th>Count</th><th>Reason</th></tr>
         {% for entry in type_data %}
           <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href="{% url reports_entry entry.class_name entry.pk %}">{{entry.name}}</a></td>
+            <td><a href='{% url "reports_entry" entry.class_name entry.pk %}'>{{entry.name}}</a></td>
             <td>{{entry.num_entries}}</td>
-            <td><a href="{% url reports_item entry.class_name entry.pk %}">{{entry.short_list|join:","}}</a></td>
+            <td><a href='{% url "reports_item" entry.class_name entry.pk %}'>{{entry.short_list|join:","}}</a></td>
           </tr>
         {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/summary.html b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
index b9847cf96..ffafd52e0 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/summary.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Client Summary{% endblock %}
 {% block pagebanner %}Clients - Summary{% endblock %}
@@ -30,7 +34,7 @@ hide_tables[{{ forloop.counter0 }}] = "table_{{ summary.name }}";
       <table id='table_{{ summary.name }}' class='entry_list'>
         {% for node in summary.nodes|sort_interactions_by_name %}
           <tr class='{% cycle listview,listview_alt %}'>
-              <td><a href="{% url reports_client_detail_pk hostname=node.client.name,pk=node.id %}">{{ node.client.name }}</a></td>
+              <td><a href='{% url "reports_client_detail_pk" hostname=node.client.name pk=node.id %}'>{{ node.client.name }}</a></td>
           </tr>
         {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/timing.html b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
index ff775ded5..8ac5e49bb 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/timing.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Performance Metrics{% endblock %}
 {% block pagebanner %}Performance Metrics{% endblock %}
@@ -12,7 +16,7 @@
 <div class='client_list_box'>
   {% if metrics %}
       <table cellpadding="3">
-	  <tr id='table_list_header' class='listview'>
+          <tr id='table_list_header' class='listview'>
               <td>Name</td>
               <td>Parse</td>
               <td>Probe</td>
@@ -21,15 +25,15 @@
               <td>Config</td>
               <td>Total</td>
           </tr>
-	  {% for metric in metrics|dictsort:"name" %}
+          {% for metric in metrics|dictsort:"name" %}
           <tr class='{% cycle listview,listview_alt %}'>
               <td><a style='font-size: 100%'
-                   href="{% url reports_client_detail hostname=metric.name %}">{{ metric.name }}</a></td>
+                   href='{% url "reports_client_detail" hostname=metric.name %}'>{{ metric.name }}</a></td>
               {% for mitem in metric|build_metric_list %}
               <td>{{ mitem }}</td>
               {% endfor %}
-	  </tr>
-	  {% endfor %}
+          </tr>
+          {% endfor %}
       </table>
   {% else %}
     <p>No metric data available</p>
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
index f5f2e7528..489682f30 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
@@ -5,9 +5,8 @@ from django import template
 from django.conf import settings
 from django.core.urlresolvers import resolve, reverse, \
                                      Resolver404, NoReverseMatch
-from django.template.loader import get_template, \
-        get_template_from_string,TemplateDoesNotExist
-from django.utils.encoding import smart_unicode, smart_str
+from django.template.loader import get_template_from_string
+from django.utils.encoding import smart_str
 from django.utils.safestring import mark_safe
 from datetime import datetime, timedelta
 from Bcfg2.Reporting.utils import filter_list
@@ -133,19 +132,22 @@ def filter_navigator(context):
                 del myargs[filter]
                 filters.append((filter,
                                 reverse(view, args=args, kwargs=myargs) + qs))
-        filters.sort(lambda x, y: cmp(x[0], y[0]))
+        filters.sort(key=lambda x: x[0])
 
         myargs = kwargs.copy()
-        selected=True
+        selected = True
         if 'group' in myargs:
             del myargs['group']
-            selected=False
-        groups = [('---', reverse(view, args=args, kwargs=myargs) + qs, selected)]
+            selected = False
+        groups = [('---',
+                   reverse(view, args=args, kwargs=myargs) + qs,
+                   selected)]
         for group in Group.objects.values('name'):
             myargs['group'] = group['name']
-            groups.append((group['name'], reverse(view, args=args, kwargs=myargs) + qs, 
-                group['name'] == kwargs.get('group', '')))
-            
+            groups.append((group['name'],
+                           reverse(view, args=args, kwargs=myargs) + qs,
+                           group['name'] == kwargs.get('group', '')))
+
         return {'filters': filters, 'groups': groups}
     except (Resolver404, NoReverseMatch, ValueError, KeyError):
         pass
@@ -205,7 +207,7 @@ def sort_interactions_by_name(value):
     Sort an interaction list by client name
     """
     inters = list(value)
-    inters.sort(lambda a, b: cmp(a.client.name, b.client.name))
+    inters.sort(key=lambda a: a.client.name)
     return inters
 
 
@@ -223,7 +225,7 @@ class AddUrlFilter(template.Node):
             filter_value = self.filter_value.resolve(context, True)
             if filter_value:
                 filter_name = smart_str(self.filter_name)
-                filter_value = smart_unicode(filter_value)
+                filter_value = smart_str(filter_value)
                 kwargs[filter_name] = filter_value
                 # These two don't make sense
                 if filter_name == 'server' and 'hostname' in kwargs:
@@ -306,6 +308,7 @@ def to_media_url(parser, token):
 
     return MediaTag(filter_value)
 
+
 @register.filter
 def determine_client_state(entry):
     """
@@ -338,10 +341,11 @@ def do_qs(parser, token):
     try:
         tag, name, value = token.split_contents()
     except ValueError:
-        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" \
-            % token.contents.split()[0]
+        raise template.TemplateSyntaxError("%r tag requires exactly two arguments"
+                                           % token.contents.split()[0])
     return QsNode(name, value)
 
+
 class QsNode(template.Node):
     def __init__(self, name, value):
         self.name = template.Variable(name)
@@ -359,7 +363,7 @@ class QsNode(template.Node):
             return ''
         except KeyError:
             if settings.TEMPLATE_DEBUG:
-                raise Exception,  "'qs' tag requires context['request']"
+                raise Exception("'qs' tag requires context['request']")
             return ''
         except:
             return ''
@@ -380,6 +384,7 @@ def sort_link(parser, token):
 
     return SortLinkNode(sort_key, text)
 
+
 class SortLinkNode(template.Node):
     __TMPL__ = "{% load bcfg2_tags %}<a href='{% qs 'sort' key %}'>{{ text }}</a>"
 
@@ -420,4 +425,3 @@ class SortLinkNode(template.Node):
                 raise
             raise
             return ''
-
diff --git a/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
index 2712d6395..22700689f 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/syntax_coloring.py
@@ -1,11 +1,8 @@
-import sys
 from django import template
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_str
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
-from Bcfg2.Compat import u_str
-
 register = template.Library()
 
 # pylint: disable=E0611
@@ -33,9 +30,9 @@ def syntaxhilight(value, arg="diff", autoescape=None):
 
     if colorize:
         try:
-            output = u_str('<style  type="text/css">') \
-                + smart_unicode(HtmlFormatter().get_style_defs('.highlight')) \
-                + u_str('</style>')
+            output = smart_str('<style  type="text/css">') \
+                + smart_str(HtmlFormatter().get_style_defs('.highlight')) \
+                + smart_str('</style>')
 
             lexer = get_lexer_by_name(arg)
             output += highlight(value, lexer, HtmlFormatter())
@@ -43,6 +40,7 @@ def syntaxhilight(value, arg="diff", autoescape=None):
         except:
             return value
     else:
-        return mark_safe(u_str('<div class="note-box">Tip: Install pygments '
-                               'for highlighting</div><pre>%s</pre>') % value)
+        return mark_safe(smart_str(
+                            '<div class="note-box">Tip: Install pygments '
+                            'for highlighting</div><pre>%s</pre>') % value)
 syntaxhilight.needs_autoescape = True
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index 9393830a8..9adfd66bf 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -32,6 +32,8 @@ TIME_ZONE = None
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
+ALLOWED_HOSTS = ['*']
+
 MEDIA_URL = '/site_media/'
author	Sol Jerome <sol.jerome@gmail.com>	2013-06-05 10:43:43 -0500
committer	Sol Jerome <sol.jerome@gmail.com>	2013-06-05 10:43:43 -0500
commit	8d561f220c29278b2e81484a38bc12d729baa701 (patch)
tree	0b5db1b4001c2505de254e3b0e7f81563f6f1818 /src/lib
parent	484d8100cdcdfa316cbf9568928697044cc331b8 (diff)
parent	fd993228d36c166593285a8ebbd2e6fb45c36d4d (diff)
download	bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.tar.gz bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.tar.bz2 bcfg2-8d561f220c29278b2e81484a38bc12d729baa701.zip