Commit Graph

533 Commits (master)
 

Author SHA1 Message Date
Apprentice Harper f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
Python 3 fixes config.py alfcrypto.py
4 years ago
Apprentice Harper af0acf31a3
Merge pull request #1338 from ivan-m/wine_pythonpath
Set PYTHONPATH="" when running through wine
4 years ago
Aldo 6dd022e6a0 Python 3 fixes config.py alfcrypto.py 4 years ago
Ivan Lazar Miljenovic ef59e112c1 Set PYTHONPATH="" when running through wine
Without this, it's possible for the Linux PYTHONPATH to leak through
and mixing up the PyCrypto libraries being called (or possibly
exceeding the allowed length of the PYTHONPATH in wine).
4 years ago
Apprentice Harper 019abecd05
Merge pull request #1333 from jpwhiting/fixwinreg
Fixwinreg - thanks, these all look useful and good.
4 years ago
Apprentice Harper 7b3bbbd008
Merge pull request #1331 from koumaza/koumaza/issue-template
Create Question Issue Template
4 years ago
Apprentice Harper 32968b1328
Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove
Add link to Wiki Page `How to remove DRM` in README.md
4 years ago
Jeremy Whiting e0ec691dd6 Fix another exception thrown when unable to find kindle keys. 4 years ago
Jeremy Whiting 0add3646d9 _winreg in python3 has been changed to winreg. Update imports. 4 years ago
shanghai yakisoba chan! 16024ee972
Update README.md
Change Wiki Link
4 years ago
shanghai yakisoba chan! 9cfe09e507
Create QUESTION.md 4 years ago
shanghai yakisoba chan! 4a58d6f7dc
Update README.md
Add Wiki Page Link
4 years ago
Apprentice Harper c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch
Get working kindlekey.py on Python 3.8.6
4 years ago
Task Hazy cc33f40ecc Get working kindlekey.py on Python 3.8.6 4 years ago
Apprentice Harper 939cdbb0c9 More fixes for Amazon books, fixing identity checks, started on Topaz. 4 years ago
Apprentice Harper dc27c36761 test file type correctly 4 years ago
Apprentice Harper 7262264b95
Update README.md 4 years ago
Apprentice Harper 4b160132a5 Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 4 years ago
Apprentice Harper 85fb4ff729
Merge pull request #1297 from PetraOleum/patch-1
Update doc link for preferences code
4 years ago
Apprentice Harper 608bd400ee
Merge pull request #1296 from tartley/lint-fixes
Fix CI lint failures
4 years ago
Apprentice Harper 781268e17e More general changes, and get mobidedrm and kindlekey to work on Mac. 4 years ago
Petra Lamborn 41d3da12ec
Update doc link for preferences code
This should really be properly explained, but at least it's not a dead link now!
4 years ago
Jonathan Hartley 83139bc590 Remove unused fns in make_release.py 4 years ago
Apprentice Harper e31752e334 Mostly Mac fixes. mobidedrm.py now works, and k4mobidedrm for at least some input. kindlekey.py should be working too. But lots more changes and testing to do. 4 years ago
Apprentice Harper 2eb31c8fb5
Merge pull request #1275 from jpwhiting/python3fixes
Python3fixes
4 years ago
Apprentice Harper a3c7bad67e
Merge pull request #1265 from heindevries/master
Some changes in obok.py to make it work on windows
4 years ago
Jeremy Whiting dca0cf7d00 Fix kgenpids string vs bytes usage for python3 for calibre 5.1.
In order to properly get pids etc. we need to pass bytes to MD5 and SHA1
instead of unicode strings. Also ord() is no longer needed since
data is bytes value gets int and we need chr() to get characters from
the mapping bytearrays.
4 years ago
Jeremy Whiting 62e0a69089 Fix launching help link from customization dialog.
To fix error with python3 when launching help link open files in binary
mode.
4 years ago
Jeremy Whiting 9df1563492 Use open instead of file() to export keys to file.
Fixes export of Kindle keys in calibre 5.0.1 here.
4 years ago
keshavgbpecdelhi 971db9ae71
using the Kindle & prompt
As I already said prompt is the right word so yeah...
and "you are use kindle" is making no sense so replacing it to make it meaningful i.e. "If you are using the Kindle for PC under Wine"
4 years ago
keshavgbpecdelhi cf829db532
wil to will
typo
4 years ago
keshavgbpecdelhi 80c8bd2d24
prompt and will
Sorry but typos are typos 
"promt" should be written as "prompt"
and "wil" should be "will"
4 years ago
keshavgbpecdelhi 969599ce6b
"promt" doesn't make any sense
I think it may be a silly mistake or something because the other prompts are written well except this. Just to webpage will not look authentic by using a wrong spelling so writing the sentence like as follows :
Clicking this button will prompt you to enter a new name for the highlighted key in the list.
4 years ago
HdV f55420bbf4 Merge branch 'master' of https://github.com/heindevries/DeDRM_tools
merging
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 ff8d44492e Fix problem on Mac with byte arrays. 4 years ago
Apprentice Harper 21d4811bfe
Merge pull request #1255 from cclauss/patch-2
GitHub Action test on both Python 2 and Python 3
4 years ago
Christian Clauss 558efebbff
Update genbook.py 4 years ago
Christian Clauss 1eaee6a0a8
Old style exceptions are syntax errors in Python 3
Switch to new style exceptions which work on both Python 2 and Python 3.
4 years ago
Christian Clauss 3f644ddfd6
print() is a function in Python since 1/1/2020 4 years ago
Christian Clauss 08bdacf476
Fix Python syntax error: add a comma
Discovered by flake8 running in our GitHub Action
4 years ago
Christian Clauss 109261bdc0
GitHub Action test on both Python 2 and Python 3 4 years ago
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 4 years ago
Apprentice Harper 6920f79a26
Merge pull request #1248 from kubik147/adobekey
Make adobekey.py work in Python 3
4 years ago
kubik147 2800f7cd80 Remove the u string prefixes 4 years ago
kubik147 61c5096da0 Make adobekey.py work in Python 3 4 years ago
Apprentice Harper 9118ce77ab
Merge pull request #1170 from Dr-Willy/master
Fix path in make_release.py
4 years ago
Apprentice Harper c3aa1b62bb
Merge pull request #1241 from erikbrinkman/patch-1
Support ebook-convert
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
Erik Brinkman c516306858
Support ebook-convert
`ebook-convert`  converts ebooks without adding them to the calibre library, and so dedrm_tools fails to run and convert books that are processed in this way. Adding on_preprocess means that it will also run on any preprocessing allowing these tools to be used by the cli tools.

As far as I'm aware, there's nothing wrong with having this run in both instances, and it still seems to allow conversion in the "standard way".
4 years ago