Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
...
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
Erik Johnson
2a8d7e2a0b
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests)
2017-12-14 00:47:44 -06:00
rallytime
71f3c73150
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/template.py
- salt/utils/pycrypto.py
- tests/integration/modules/test_state.py
- tests/unit/states/test_artifactory.py
- tests/unit/test_template.py
2017-04-05 13:02:14 -06:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup.
2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
...
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
