Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-21 22:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix C++ String escaping fixes #11

Browse source
This commit is contained in:
Otto Winter 2018-05-15 11:09:27 +02:00
parent ee502a7aaa
commit 9979ee6ddf
No known key found for this signature in database
GPG key ID: DB66C0BE6013F97E
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
esphomeyaml/helpers.py
View file

@ -7,8 +7,8 @@ from collections import OrderedDict, deque
from esphomeyaml import core from esphomeyaml import core
from esphomeyaml.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, \ from esphomeyaml.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, \
CONF_INVERTED, \ CONF_INVERTED, \
CONF_MODE, CONF_NUMBER, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_RETAIN, \ CONF_MODE, CONF_NUMBER, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_PCF8574, \
CONF_STATE_TOPIC, CONF_TOPIC, CONF_PCF8574 CONF_RETAIN, CONF_STATE_TOPIC, CONF_TOPIC
from esphomeyaml.core import ESPHomeYAMLError, HexInt, TimePeriodMicroseconds, \ from esphomeyaml.core import ESPHomeYAMLError, HexInt, TimePeriodMicroseconds, \
TimePeriodMilliseconds, TimePeriodSeconds TimePeriodMilliseconds, TimePeriodSeconds
@ -185,13 +185,26 @@ class Literal(Expression):
raise NotImplementedError raise NotImplementedError
# From https://stackoverflow.com/a/14945195/8924614
def cpp_string_escape(s, encoding='utf-8'):
if isinstance(s, unicode):
s = s.encode(encoding)
result = ''
for c in s:
if not (32 <= ord(c) < 127) or c in ('\\', '"'):
result += '\\%03o' % ord(c)
else:
result += c
return '"' + result + '"'
class StringLiteral(Literal): class StringLiteral(Literal):
def __init__(self, string): def __init__(self, string):
super(StringLiteral, self).__init__() super(StringLiteral, self).__init__()
self.string = string self.string = string
def __str__(self): def __str__(self):
return u'"{}"'.format(self.string) return u'{}'.format(cpp_string_escape(self.string))
class IntLiteral(Literal): class IntLiteral(Literal):