fix up a few minor errors apparent from the merge
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 11 Feb 2011 14:42:06 -0600
changeset 1268 661d1c18253278d61dc7fc93b04c64b6bf4c6965
parent 1266 0bcdf35041902f0bffd58173371f77d2879bfd0a
child 1269 bf23798f3c5a24476f1d4c1ed6e70662c61d66c6
push id894
push userdmitchell@mozilla.com
push dateFri, 18 Mar 2011 22:21:21 +0000
fix up a few minor errors apparent from the merge
.hgignore
lib/python/slavealloc/daemon/http/ui.py
lib/python/slavealloc/daemon/service.py
lib/python/slavealloc/www/js/views.js
setup.py
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,5 @@
+.*.pyc
 slavealloc.db
 .*.swp
 twistd.pid
+.*\.egg-info
--- a/lib/python/slavealloc/daemon/http/ui.py
+++ b/lib/python/slavealloc/daemon/http/ui.py
@@ -1,12 +1,10 @@
 import os
 from twisted.web import static
-from twisted.web import resource
-from slavealloc.daemon.ui import slaves
 
 def makeRootResource():
     # root corresponds to slavealloc/www
     wwwdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "www"))
     root = static.File(wwwdir)
 
     # serve 'index.html' at the root
     root.putChild('', static.File(os.path.join(wwwdir, 'index.html')))
--- a/lib/python/slavealloc/daemon/service.py
+++ b/lib/python/slavealloc/daemon/service.py
@@ -1,11 +1,11 @@
 from twisted.python import log
 from twisted.internet import defer
-from twisted.application import service, strports
+from twisted.application import service
 import sqlalchemy
 from slavealloc.logic import allocate, buildbottac
 from slavealloc.data import model
 from slavealloc import exceptions
 
 class AllocatorService(service.Service):
     
     def __init__(self, db_url):
--- a/lib/python/slavealloc/www/js/views.js
+++ b/lib/python/slavealloc/www/js/views.js
@@ -658,17 +658,16 @@ var SilosTableView = ReportTableView.ext
             return row;
         });
 
         this.reportData = data;
     },
 
     makeReportData: function() {
         this.makeData();
-        console.log(this.reportColumns);
         return this.reportData;
     },
 
     makeReportColumns: function() {
         this.makeData();
         return this.reportColumns;
     }
 });
--- a/setup.py
+++ b/setup.py
@@ -13,16 +13,17 @@ setup(
     packages = find_packages(),
 
     test_suite = 'slavealloc',
 
     install_requires = [
         'sqlalchemy',
         'argparse',
         'twisted',
+        'simplejson',
     ],
 
     entry_points = {
         'console_scripts': [
             'slavealloc = slavealloc.scripts.main:main'
         ],
     }
 )