Merge remote-tracking branch 'origin/develop' into albulank/buildwheel

This commit is contained in:
AlexBulankou 2017-04-13 10:20:52 -07:00
Родитель 4cf4317657 fa57728b17
Коммит 4ba7dc0d74
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -8,7 +8,7 @@ This project extends the Application Insights API surface to support Python. [Ap
## Requirements ##
Python 2.7 and Python 3.4 are currently supported by this module.
Python >=2.7 and Python >=3.4 are currently supported by this module.
For opening the project in Microsoft Visual Studio you will need [Python Tools for Visual Studio](http://pytools.codeplex.com/).

Просмотреть файл

@ -101,9 +101,9 @@ class TelemetryChannel(object):
if not properties:
properties = {}
data.properties = properties
for key, value in local_context.properties:
for key in local_context.properties:
if key not in properties:
properties[key] = value
properties[key] = local_context.properties[key]
envelope.data.base_data = data
self._queue.put(envelope)