Skip to content

Python3-Support #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python3-Support #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a776379
python3-support
HassanBaker May 20, 2021
875c9df
Merge pull request #1 from HassanBaker/HassanBaker-patch-python3-support
HassanBaker May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions automationassets/automationassets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
""" Azure Automation assets module to be used with Azure Automation during offline development """
#!/usr/bin/env python2
# ----------------------------------------------------------------------------------
#
# MIT License
Expand All @@ -23,6 +22,18 @@
# SOFTWARE.
# ----------------------------------------------------------------------------------

# Support for python3
try:
dict.iteritems
except AttributeError:
# Python 3
def iteritems(d):
return iter(d.items())
else:
# Python 2
def iteritems(d):
return d.iteritems()

# Constant keys for extracing items from automation assets.
_KEY_NAME = "Name"
_KEY_VALUE = "Value"
Expand Down Expand Up @@ -52,7 +63,7 @@ def _get_asset_value(asset_file, asset_type, asset_name):
local_assets = json.loads(json_string)

return_value = None
for asset, asset_values in local_assets.iteritems():
for asset, asset_values in iteritems(local_assets):
if asset == asset_type:
for value in asset_values:
if value[_KEY_NAME] == asset_name:
Expand Down Expand Up @@ -83,7 +94,7 @@ def _set_asset_value(asset_file, asset_type, asset_name, asset_value):
local_assets = json.loads(json_string)
item_found = False

for asset, asset_values in local_assets.iteritems():
for asset, asset_values in iteritems(local_assets):
if asset == asset_type:
for value in asset_values:
if value[_KEY_NAME] == asset_name:
Expand Down