Merge remote-tracking branch 'pricingassistant/master'

agschwender · Apr 20, 2017 · 05948a5 · 05948a5
2 parents f556d2f + 47e7129
commit 05948a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/README.rst b/README.rst
@@ -153,6 +153,7 @@ To see a list of all available options, run
       --retain                   default adaptive retain percent, 1-99
       --timeout                  timeout of requests in seconds (default 10)
       --validate_cert            validate certificates (default True)
+      --user_agent               user agent
 
 
 Calling

diff --git a/pilbox/app.py b/pilbox/app.py
@@ -68,6 +68,7 @@
 define("validate_cert", help="validate certificates", type=bool, default=True)
 define("proxy_host", help="proxy hostname")
 define("proxy_port", help="proxy port", type=int)
+define("user_agent", help="user agent", type=str)
 
 # header related settings
 define("content_type_from_image",
@@ -118,6 +119,7 @@ def __init__(self, **kwargs):
             timeout=options.timeout,
             implicit_base_url=options.implicit_base_url,
             ca_certs=options.ca_certs,
+            user_agent=options.user_agent,
             validate_cert=options.validate_cert,
             content_type_from_image=options.content_type_from_image,
             proxy_host=options.proxy_host,
@@ -201,6 +203,7 @@ def fetch_image(self):
                 request_timeout=self.settings.get("timeout"),
                 ca_certs=self.settings.get("ca_certs"),
                 validate_cert=self.settings.get("validate_cert"),
+                user_agent=self.settings.get("user_agent"),
                 proxy_host=self.settings.get("proxy_host"),
                 proxy_port=self.settings.get("proxy_port"))
             raise tornado.gen.Return(resp)