From: Brian Warner <warner@lothar.com>
Date: Tue, 17 Feb 2009 02:56:58 +0000 (-0700)
Subject: web: fix handling of reliability page when Numeric is not available
X-Git-Tag: allmydata-tahoe-1.4.0~206
X-Git-Url: https://git.rkrishnan.org/simplejson/components/com_hotproperty/...?a=commitdiff_plain;h=059f24adca5f25dd5717396a9765390ed56122cc;p=tahoe-lafs%2Ftahoe-lafs.git

web: fix handling of reliability page when Numeric is not available
---

diff --git a/src/allmydata/web/reliability.py b/src/allmydata/web/reliability.py
index 72474f38..796f614d 100644
--- a/src/allmydata/web/reliability.py
+++ b/src/allmydata/web/reliability.py
@@ -12,6 +12,11 @@ DAY=24*60*60
 MONTH=31*DAY
 YEAR=365*DAY
 
+def is_available():
+    if reliability:
+        return True
+    return False
+
 def yandm(seconds):
     return "%dy.%dm" % (int(seconds/YEAR), int( (seconds%YEAR)/MONTH))
 
diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index b8f7b1a8..3a57e6b3 100644
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -11,14 +11,10 @@ from formless import webform
 import allmydata # to display import path
 from allmydata import get_package_versions_string
 from allmydata import provisioning
-reliability = None
-try:
-    from allmydata.web import reliability # requires Numeric and PIL
-except ImportError:
-    pass # might not be usable
 from allmydata.util import idlib, log
 from allmydata.interfaces import IFileNode
 from allmydata.web import filenode, directory, unlinked, status, operations
+from allmydata.web import reliability
 from allmydata.web.common import abbreviate_size, IClient, \
      getxmlfile, WebError, get_arg, RenderMixin
 
@@ -149,7 +145,7 @@ class Root(rend.Page):
     child_tahoe_css = nevow_File(resource_filename('allmydata.web', 'tahoe.css'))
 
     child_provisioning = provisioning.ProvisioningTool()
-    if reliability:
+    if reliability.is_available():
         child_reliability = reliability.ReliabilityTool()
     else:
         child_reliability = NoReliability()