From 821f14dbdb3d8ff8cb6cd8dd78bb9b8c74836bf1 Mon Sep 17 00:00:00 2001 From: alecflett Date: Mon, 21 Sep 2009 20:29:01 +0000 Subject: tweaks to make tests pass - dump_domain->dump_base, etc git-svn-id: http://freebase-python.googlecode.com/svn/trunk@214 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2 --- freebase/api/httpclients.py | 2 +- freebase/api/session.py | 10 +++++++--- freebase/schema.py | 5 ++++- test/test_hardcore_schema_manipulation.py | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/freebase/api/httpclients.py b/freebase/api/httpclients.py index 48af9b6..4626ad6 100644 --- a/freebase/api/httpclients.py +++ b/freebase/api/httpclients.py @@ -24,7 +24,7 @@ class Urllib2Client(object): cookiespy = urllib2.HTTPCookieProcessor(cookiejar) self.opener = urllib2.build_opener(cookiespy) self._raise_service_error = rse - self.log = logging.getLogger() + self.log = logging.getLogger("freebase") def __call__(self, url, method, body, headers): req = urllib2.Request(url, body, headers) diff --git a/freebase/api/session.py b/freebase/api/session.py index 5457508..93e9a35 100644 --- a/freebase/api/session.py +++ b/freebase/api/session.py @@ -209,7 +209,7 @@ class HTTPMetawebSession(MetawebSession): # see each other's writes immediately. _default_cookiejar = cookielib.CookieJar() - def __init__(self, service_url, username=None, password=None, prev_session=None, cookiejar=None, cookiefile=None): + def __init__(self, service_url, username=None, password=None, prev_session=None, cookiejar=None, cookiefile=None, application_name=None): """ create a new MetawebSession for interacting with the Metaweb. @@ -217,7 +217,8 @@ class HTTPMetawebSession(MetawebSession): """ super(HTTPMetawebSession, self).__init__() - self.log = logging.getLogger() + self.log = logging.getLogger("freebase") + self.application_name = application_name assert not service_url.endswith('/') if not '/' in service_url: # plain host:port @@ -323,7 +324,10 @@ class HTTPMetawebSession(MetawebSession): headers['x-metaweb-request'] = 'Python' if 'user-agent' not in headers: - headers['user-agent'] = 'python freebase.api-%s' % __version__ + user_agent = ["python", "freebase.api-%s" % __version__] + if self.application_name: + user_agent.append(self.application_name) + headers['user-agent'] = ' '.join(user_agent) ####### DEBUG MESSAGE - should check log level before generating loglevel = self.log.getEffectiveLevel() diff --git a/freebase/schema.py b/freebase/schema.py index 4198993..7661789 100644 --- a/freebase/schema.py +++ b/freebase/schema.py @@ -455,7 +455,10 @@ def reciprocate_property(s, name, key, master, unique=False, disambig=False, tip def dump_base(s, base_id): """ dump a base into a `graph` object. See information at the top of the file for more information on the graph file """ - types = [add_type_to_object["id"] for type_object in s.mqlread({"id" : base_id, "/type/domain/types":[{"id" : None}]})["/type/domain/types"]] + domain_types = s.mqlread({"id" : base_id, + "/type/domain/types": [{"id" : None}]}) + types = [type_object["id"] + for type_object in domain_types["/type/domain/types"]] graph = _get_graph(s, types, True) return graph diff --git a/test/test_hardcore_schema_manipulation.py b/test/test_hardcore_schema_manipulation.py index 58f7e66..e5640b0 100644 --- a/test/test_hardcore_schema_manipulation.py +++ b/test/test_hardcore_schema_manipulation.py @@ -73,11 +73,11 @@ class TestHardcoreSchemaManipulation(unittest.TestCase): def test_restore_over_restore(self): domain_id = _create_domain() - graph = dump_domain(s, "/base/contractbridge") + graph = dump_base(s, "/base/contractbridge") restore(s, graph, domain_id) # now we restore again... it should raise a MetawebError - self.assertRaises(MetawebError, restore(s, graph, domain_id)) + self.assertRaises(MetawebError, restore, s, graph, domain_id) def test_try_copying_a_cvt(self): -- cgit v1.3.1