diff options
| author | alecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2> | 2009-09-21 20:29:01 +0000 |
|---|---|---|
| committer | alecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2> | 2009-09-21 20:29:01 +0000 |
| commit | 821f14dbdb3d8ff8cb6cd8dd78bb9b8c74836bf1 (patch) | |
| tree | bc3c5ef5143a12f2435c7a8e4d373846f17c54dc /freebase | |
| parent | b30b191aaf7be0b96543529fa3accf0305bf8355 (diff) | |
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
Diffstat (limited to 'freebase')
| -rw-r--r-- | freebase/api/httpclients.py | 2 | ||||
| -rw-r--r-- | freebase/api/session.py | 10 | ||||
| -rw-r--r-- | freebase/schema.py | 5 |
3 files changed, 12 insertions, 5 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 |