Skip to content
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.

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

Py3 Fixes #39320

Merged
merged 20 commits into from Feb 13, 2017
Merged

Py3 Fixes #39320

merged 20 commits into from Feb 13, 2017

Conversation

s0undt3ch
Copy link
Member

What does this PR do?

Py3 fixes for the file state module (and some more minor stuff)

@s0undt3ch s0undt3ch force-pushed the features/py3 branch 3 times, most recently from 9a0851a to 3af2255 Compare February 11, 2017 00:59
@ninja-
Copy link
Contributor

ninja- commented Feb 11, 2017

@s0undt3ch great stuff. I am running python3 on prod. for a while and I monkey-patched some of these issues you are fixing right now.
In particular

  • if 'salt' in fp_.read()
  • chmod octal encoding

Btw...the worst non-fixed yet py3 bugs(I need to make a list) I remember are:

  • some compatibility crash that makes salt-master hang on $ systemctl restart salt-master
  • failed to import highstate_return cause of StringIO
2017-02-12 02:30:59,503 [salt.utils.process][ERROR   ][1171] An un-handled exception from the multiprocessing process 'Maintenance-6' was caught:
Traceback (most recent call last):
  File "/usr/lib/python3.6/site-packages/salt/utils/process.py", line 644, in _run
    return self._original_run()
  File "/usr/lib/python3.6/site-packages/salt/master.py", line 243, in run
    self.handle_key_rotate(now)
  File "/usr/lib/python3.6/site-packages/salt/master.py", line 309, in handle_key_rotate
    secret_map['secret'].value = secret_map['reload']()
  File "<string>", line 11, in setvalue
TypeError: bytes expected instead of str instance

@s0undt3ch s0undt3ch force-pushed the features/py3 branch 2 times, most recently from b89c125 to ba134c8 Compare February 12, 2017 12:44
@s0undt3ch
Copy link
Member Author

Go Go Jenkins!

@ninja-
Copy link
Contributor

ninja- commented Feb 13, 2017

@s0undt3ch I fully tested your PR and now I am running it on production with no problems with python3
👍

@s0undt3ch
Copy link
Member Author

Production? You are brave!!!

@ninja-
Copy link
Contributor

ninja- commented Feb 13, 2017

😄

@ninja-
Copy link
Contributor

ninja- commented Feb 13, 2017

@s0undt3ch s0undt3ch changed the title Py3 Fixes - File state module (and some more minor stuff) Py3 Fixes Feb 13, 2017
@cachedout
Copy link
Contributor

@s0undt3ch
Copy link
Member Author

Fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants