Fix import of openmetrics, and make accept handling more general. (prometheus#318)

brian-brazil · web-flow · commit 9021384fc5bf · 2018-10-08T13:15:33.000+01:00
Signed-off-by: Brian Brazil &lt;brian.brazil@robustperception.io&gt;
diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py
@@ -11,7 +11,7 @@
 from wsgiref.simple_server import make_server, WSGIRequestHandler
 
 from prometheus_client import core
-from prometheus_client import openmetrics
+from prometheus_client.openmetrics import exposition as openmetrics
 try:
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
     from SocketServer import ThreadingMixIn
@@ -124,9 +124,9 @@ def sample_line(s):
 def choose_encoder(accept_header):
     accept_header = accept_header or ''
     for accepted in accept_header.split(','):
-        if accepted == 'application/openmetrics-text; version=0.0.1':
-            return (openmetrics.exposition.generate_latest, 
-                    openmetrics.exposition.CONTENT_TYPE_LATEST)
+        if accepted.split(';')[0].strip() == 'application/openmetrics-text':
+            return (openmetrics.generate_latest,
+                    openmetrics.CONTENT_TYPE_LATEST)
     return (generate_latest, CONTENT_TYPE_LATEST)
 
 
