Skip to content

Commit

Permalink
Merge branch 'release/1.0.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
eedgar committed Aug 7, 2013
2 parents ce3b198 + 1311b61 commit bc84c33
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 additions & 6 deletions zpg/Property.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,13 @@ def value(self, value):
self._value = 'None' if value is None else value
if self.type_ == 'list' or self.type_ == 'lines':
self._value = []
for item in value:
if isinstance(item, unicode):
self._value.append(item.encode('utf-8'))
else:
self._value.append(item)

if value:
for item in value:
if isinstance(item, unicode):
self._value.append(item.encode('utf-8'))
else:
self._value.append(item)

@property
def quoted_value(self):
value = self.value
Expand Down
2 changes: 1 addition & 1 deletion zpg/_defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
'author': 'ZenossLabs <[email protected]>',
'author_email': '[email protected]',
'description': 'A tool to assist building zenpacks.',
'version': '1.0.10',
'version': '1.0.11',
'license': 'GPLv2',
'component_classes': [
'Products.ZenModel.DeviceComponent.DeviceComponent',
Expand Down

0 comments on commit bc84c33

Please sign in to comment.