Changeset 13936 in genesis for tools

Timestamp:

Jul 6, 2017, 9:00:04 AM (7 years ago)

Author:

rick

Message:

Add text/plain to list of accepted plain targets

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -1748 +1748 @@
 def is_text_request(environ=os.environ):
   """ Find out whether we are calling from the CLI or any text based CLI utility """
-  try:
-    return environ['HTTP_USER_AGENT'].split()[0] in ['curl', 'fetch', 'wget']
-  except KeyError:
+  if 'CONTENT_TYPE' in os.environ and os.environ['CONTENT_TYPE'] == 'text/plain':
     return True
+
+  if 'HTTP_USER_AGENT' in environ:
+    return any([os.environ['HTTP_USER_AGENT'].lower().startswith(x) for x in ['curl', 'fetch', 'wget']])
+  else:
+    return False
+
 
 def switchFormat(setting):