rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests
2018-01-23 15:26:25 -05:00
twangboy
b9dc4b0610
Use six.text_type instead of str
2018-01-23 13:21:05 -07:00
Gareth J. Greenaway
0d2eb72547
Requested changes.
2018-01-23 11:53:17 -08:00
Gareth J. Greenaway
b1b164a227
Couple lint fixes
2018-01-23 11:53:16 -08:00
Gareth J. Greenaway
49d0d1f1a5
Updating various modules, states and related tests for Unicode fun & profit part one.
2018-01-23 11:53:16 -08:00
Nicole Thomas
80c9787417
Merge pull request #45574 from rallytime/unicode-changes-2
...
Add unicode_literals to more modules, states, and tests
2018-01-23 13:37:46 -05:00
rallytime
583a89ca6f
Update old utils paths to new paths
2018-01-23 13:34:24 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/modules/pip.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/runners/manage.py
- salt/states/pkg.py
- salt/transport/zeromq.py
- salt/utils/event.py
- tests/integration/modules/test_pip.py
- tests/integration/states/test_user.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_archive.py
- tests/unit/utils/test_boto.py
2018-01-23 13:26:43 -05:00
Nicole Thomas
e0394d1420
Merge pull request #45635 from rallytime/fix-lint
...
Fix Lint: Remove unused import
2018-01-23 10:44:12 -05:00
rallytime
ed4bfec242
Fix Lint: Remove unused import
2018-01-23 10:43:03 -05:00
rallytime
72e6b31314
Fixup using maketrans for PY2/PY3 and unicode
2018-01-23 10:37:32 -05:00
rallytime
ab103d4b58
Fix unicode issue with w+
2018-01-23 10:08:59 -05:00
rallytime
23683a9299
Lint fix: whitespace!
2018-01-23 10:08:59 -05:00
rallytime
10b7b0601d
Add unicode_literals to more modules, states, and tests
2018-01-23 10:08:59 -05:00
rallytime
7d2a0eb5fc
Fix hashutils issues found with tests
2018-01-23 09:55:57 -05:00
rallytime
2bef3c4b47
Apply fix from @terminalmage that got lost in rebase
2018-01-23 09:55:47 -05:00
rallytime
be926fee40
Lint fix
2018-01-23 09:55:47 -05:00
rallytime
22b16acf04
Follow up on PR reviews: don't use %s on non-logging lines
2018-01-23 09:55:46 -05:00
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H)
2018-01-23 09:55:46 -05:00
Daniel Wallace
0e2628a8aa
Merge pull request #45632 from gtmanfred/oxygen
...
pull minion log from kitchen sandbox
2018-01-23 07:39:37 -07:00
Daniel Wallace
3c9eed8929
pull minion log from kitchen sandbox
2018-01-23 07:38:36 -07:00
Nicole Thomas
9facc5ede5
Merge pull request #45543 from terminalmage/py3-tier1-2
...
[PY3] Add unicode_literals to more high-priority states/modules
2018-01-23 09:38:21 -05:00
Nicole Thomas
a8dabbc150
Merge branch 'oxygen' into bugs/unicode_2
2018-01-23 07:56:21 -05:00
Nicole Thomas
0e50abd7f7
Merge pull request #45593 from rallytime/unicode-changes-6
...
Add unicode_literals to modules/states [z]
2018-01-23 07:52:03 -05:00
Nicole Thomas
ff997aa552
Merge pull request #45592 from rallytime/unicode-changes-5
...
Add unicode_literals to modules, states, and tests [n]
2018-01-23 07:50:46 -05:00
Nicole Thomas
5c907ebb15
Merge pull request #45586 from rallytime/unicode-changes-4
...
Add more unicode_literals to modules, states, and test files
2018-01-23 07:49:55 -05:00
Nicole Thomas
2cf7a806bc
Merge pull request #45557 from DSRCorporation/bugs/unicode_1
...
Salt Unicode Update 3rd tier 1st bunch from DK
2018-01-23 07:48:11 -05:00
Nicole Thomas
453401a9a0
Merge pull request #45621 from terminalmage/py3-fix-salt.utils.json
...
salt.utils.json: only encode data on PY2
2018-01-23 07:42:49 -05:00
Dmitry Kuzmenko
7c85465596
Process code review comments
2018-01-23 10:31:33 +03:00
Erik Johnson
ba54ff44a6
add tests for json load/dump helpers
2018-01-22 20:16:59 -06:00
Erik Johnson
7b615216a1
salt.utils.json: only encode data on PY2
...
We need a str type in both Python 2 and 3, and encoding produces
a bytes type on Python 3. This makes the encoding conditional, only
doing so in Python 2.
2018-01-22 16:59:05 -06:00
rallytime
62f260aa6e
"lint: disable=" should be "pylint: disable="
2018-01-22 17:25:28 -05:00
rallytime
a0700554d3
Update files with PR review comments
2018-01-22 17:16:47 -05:00
rallytime
ba2abee10e
Update PR with changes from review comments
2018-01-22 16:57:46 -05:00
rallytime
c2c85e3833
Fixup a couple of files based on PR comments
2018-01-22 16:36:11 -05:00
Dmitry Kuzmenko
e7b82b4fe6
Code review update
2018-01-22 23:38:08 +03:00
Nicole Thomas
63a294f498
Merge pull request #45609 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.3 to 2017.7
2018-01-22 15:24:35 -05:00
Nicole Thomas
98e2d66809
Merge pull request #45567 from twangboy/win_fix_test_process
...
Fix `unit.utils.test_process` on Windows
2018-01-22 14:50:05 -05:00
Nicole Thomas
d066e75473
Merge pull request #45568 from twangboy/win_fix_test_schema
...
Fix `unit.utils.test_schema` for Windows/Py2
2018-01-22 14:46:23 -05:00
Nicole Thomas
af033f1c93
Merge pull request #45549 from rallytime/unicode-i
...
Add unicode_literals to modules, states, tests (I)
2018-01-22 14:40:11 -05:00
Nicole Thomas
59329957ca
Merge pull request #45576 from zer0def/boto3-route53-typo
...
Fixed boto3_route53 execution module function signature `diSassociate_vpc_from_hosted_zone` typo. (refs #45431 )
2018-01-22 14:37:12 -05:00
Erik Johnson
3bff5774a7
cmdmod: Remove more unnecessary environment variable encoding
...
This causes errors in subprocess.Popen in Python 3 since it expects the
environment to be strings and not bytes.
The encoding that was done before was likely done to keep unicode types
out of the env dict on Python 2, since encoding produces a `str` type on
Python 2, but it doesn't do that on Python 3.
2018-01-22 12:34:25 -06:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7'
...
No conflicts.
2018-01-22 11:55:54 -05:00
Nicole Thomas
ced3269ae8
Merge pull request #45604 from rallytime/bp-45582
...
Back-port #45582 to 2017.7.3
2018-01-22 11:54:14 -05:00
Dmitry Kuzmenko
1cbca55a84
Fixed lint errors
2018-01-22 18:02:34 +03:00
rallytime
b149b0ff0e
Lint fix
2018-01-22 10:00:19 -05:00
Dmitry Kuzmenko
e119b7c55a
Fixed lint failures
2018-01-22 17:59:17 +03:00
rallytime
33a36d5433
Add unicode_literals to modules/states [z]
2018-01-22 09:57:08 -05:00
rallytime
e129d7fe68
Use six.string_types with isinstance instead of str check
2018-01-22 09:54:38 -05:00
rallytime
8d54b95d8c
Add unicode_literals to modules, states, and tests [n]
2018-01-22 09:42:15 -05:00
