Merged cipy-master

diff --git a/examples/all-in-one-no-pm.py b/examples/all-in-one-no-pm.py
index bc19e123d5b7ea175623137f03fa3d13f0c34049..4d6d4635e196fc05598a4db6eac690b4d6186f4b 100755 (executable)
--- a/examples/all-in-one-no-pm.py
+++ b/examples/all-in-one-no-pm.py
@@ -78,7 +78,7 @@ def display_text(variable, data, unit):
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():

-    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
+    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)

     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])
     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])

diff --git a/examples/all-in-one.py b/examples/all-in-one.py
index 695a007e0d33a538fa9f3ca1efc9dbeb90ac45e8..8e82b6b969510cd7fc55c5b854efab3d31185212 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -84,7 +84,7 @@ def display_text(variable, data, unit):
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():

-    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
+    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)

     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])
     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])

diff --git a/examples/luftdaten.py b/examples/luftdaten.py
index 77a6d820d70e327d7affc3ed5f4a887eab19ba02..9995914e23d71144c9f1e99ff11c58f7baaf4e69 100755 (executable)
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@ -72,7 +72,7 @@ def read_values():
 
 # Get CPU temperature to use for compensation
 def get_cpu_temperature():
 
 # Get CPU temperature to use for compensation
 def get_cpu_temperature():

-    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
+    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)

     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])
     output, _error = process.communicate()
     output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])