Commit Graph

9 Commits (master)

Author SHA1 Message Date
Apprentice Harper 86a90117e5
Merge pull request #1586 from raiden64/master
Fix in keyfetch for obok on MacOS
3 years ago
raiden64 0ce86fa8db Fix in keyfetch for obok on MacOS 3 years ago
journeyman88 ecc7db09a9 Fix in keyfetch for obok on win10
According to calibre debug the ipconfig command returned some invalid utf-8 characters (I think is maybe an issue due to the Python2 switch-off as the 4.x version worked fine).
To solve this I've changed the external call and modified the regex to match both the output of "ipconfig" and that of "wmic".
3 years ago
lkcv 6cbc5285cb
Update obok.py 3 years ago
Jeremy Whiting 0add3646d9 _winreg in python3 has been changed to winreg. Update imports. 4 years ago
HdV 7f758566d3 Changes to make obok work on win
_winreg renamed to winreg in python 3
os.popen3() replaced by subprocess.Popen()
4 years ago
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 4 years ago
Apprentice Harper afa4ac5716 Starting on Version 7.0 using the work done by others. Completely untested. I will be testing things, but I thought I'd get this base version up for others to give pull requests.
THIS IS ON THE MASTER BRANCH. The Master branch will be Python 3.0 from now on. While Python 2.7 support will not be deliberately broken, all efforts should now focus on Python 3.0 compatibility.

I can see a lot of work has been done. There's more to do. I've bumped the version number of everything I came across to the next major number for Python 3.0 compatibility indication.

Thanks everyone. I hope to update here at least once a week until we have a stable 7.0 release for calibre 5.0
4 years ago
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 4 years ago