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

2 files changed, 8 insertions, 4 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()