# HG changeset patch # User Jeff Hammel # Date 1341968959 25200 # Node ID 1b18b2746e69de87344b7470a5b3cb0150257683 # Parent 323a01abd18031d23ba0b954092deca912ba2035 minor fixes diff -r 323a01abd180 -r 1b18b2746e69 setup.py --- a/setup.py Tue Jul 10 17:12:59 2012 -0700 +++ b/setup.py Tue Jul 10 18:09:19 2012 -0700 @@ -5,7 +5,7 @@ import os version = "0.0" -dependencies = ['webob', 'CommandParser', 'talos'] +dependencies = ['webob', 'CommandParser', 'talos', 'buildbot'] # allow use of setuptools/distribute or distutils kw = {} diff -r 323a01abd180 -r 1b18b2746e69 talosnames/api.py --- a/talosnames/api.py Tue Jul 10 17:12:59 2012 -0700 +++ b/talosnames/api.py Tue Jul 10 18:09:19 2012 -0700 @@ -96,7 +96,8 @@ """gets the buildbot command for a particular suite""" return self.buildbot_commands.get(name) - def buildbot_config(self, name): + def talos_config(self, name): + """returns talos configuration for suite `name`""" command = self.buildbot_command(name) assert command is not None, "Suite not found: %s" % name diff -r 323a01abd180 -r 1b18b2746e69 talosnames/require.py --- a/talosnames/require.py Tue Jul 10 17:12:59 2012 -0700 +++ b/talosnames/require.py Tue Jul 10 18:09:19 2012 -0700 @@ -1,12 +1,13 @@ +import imp +import os +import tempfile +import urllib2 + def require(url): """ import a module from the web url should be like scheme://host.name/path/to/module.py """ - import imp - import os - import tempfile - import urllib2 contents = urllib2.urlopen(url).read() filename = url.rsplit('/', 1)[-1] module = filename.rsplit('.', 1)[-1]