Commit Graph

533 Commits (master)
 

Author SHA1 Message Date
Apprentice Harper d33f679eae
Merge pull request #1413 from ableeker/python3
Small fix to make Obok help link work.
3 years ago
Aldo Bleeker 225e74a334 Small fix to make Obok help work. 3 years ago
Apprentice Harper 13e9a14907
Merge pull request #1398 from xxyzz/config
return str from load_resource()
3 years ago
Apprentice Harper 92ea0a2f24
Merge pull request #1392 from penenkel/patch-1
Add conversion from bytearray to bytes so that pids are hashable
3 years ago
xxyzz a1059650f6
return str from load_resource() 3 years ago
penenkel a3cc221932
Revert changes to k4mobidedrm.py 3 years ago
penenkel 6732be1434
`getPidList()` now returns pids as bytes instead of bytearrays 3 years ago
penenkel ad5cb056f0
Add conversion from bytearray to bytes so that pids are hashable 3 years ago
Apprentice Harper d3c7388327
Merge pull request #1389 from ableeker/python3
Python 3 fixes for __init__.py
3 years ago
Aldo Bleeker 8e436ad920 Python 3 fixes fort correct version of __init__.py 3 years ago
Aldo Bleeker ae806f734e Python 3 fixes for __init__.py 3 years ago
Apprentice Harper ccfa454226 Merge branch 'Python2' - the DeDRM plugn version change 3 years ago
Apprentice Harper 6716db1f62 Derive calibre version tuple from __version__ string 3 years ago
Apprentice Harper 0e0d7d8b14 Don't rule out running from the command line 3 years ago
Apprentice Harper 981aadc497
Merge pull request #1380 from xxyzz/byte-string
Fix byte string error for KFX
3 years ago
Apprentice Harper 26eb5d676c Merge branch 'Python2' Bring across version number updates from 6.8.1 release 3 years ago
Apprentice Harper 464788a3f1 Update DeDRM version number to 6.8.1, and kindlekey to 2.8 3 years ago
Apprentice Harper 036f9007fd Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur 3 years ago
Apprentice Harper bdd1c2e474
Merge pull request #1383 from ableeker/python3
Python 3 fixes for Barnes&Noble
3 years ago
Apprentice Harper 54a58d05a5
Merge pull request #1382 from koumaza/koumaza/refine-github-actions-workflow
Refine GitHub Actions Workflow
3 years ago
Apprentice Harper 218539f131
Merge pull request #1381 from protochron/fix_big_sur_python_2
Fix loading libcrypto on OSX Big Sur
3 years ago
Aldo Bleeker f9d9b6016f Python 3 fixes for Barnes&Noble 3 years ago
shanghai yakisoba chan! 131cea1215
Update Format.yaml: Change execution condition of workflow
Execute format workflow only if there is `!format` in the commit message.
3 years ago
shanghai yakisoba chan! 731eeac087
Refine gh-actions
* Update and rename Python_test.yml to Lint.yaml
* Create Format.yaml
3 years ago
Dan Norris cdab22e59c
Fix loading libcrypto on OSX Big Sur
It looks like Big Sur removed `libcrypto.dylib` as a file on the
filesystem, so loading it using `ctypes.find_library` fails which breaks
Kindle decryption. Now to load a dylib you need to attempt to load it
directly and the operating system will load the dylib from the OS' cache
or fail.

This fixes the problem by explicitly setting the path to libcrypto to
`/usr/lib/libcrypto.dylib` if `ctypes.find_library` does not find the
file, loading the dylib and raising an exception if it fails at that
point.

See saltstack/salt#5778 for more detailed info.

Closes #1369.
3 years ago
xxyzz b8b324956c
replace bord with ord and some other byte string fix
PyCryptodome's bord() in Python3 does nothing.
3 years ago
xxyzz 1955b34883
import ion correctly 3 years ago
Apprentice Harper dbc5c2b4de
Merge pull request #1269 from keshavgbpecdelhi/patch-4
using the Kindle & prompt
3 years ago
Apprentice Harper 856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
changing wil to will
3 years ago
Apprentice Harper f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
prompt and will
3 years ago
Apprentice Harper c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
"promt" doesn't make any sense
3 years ago
Apprentice Harper dc72c368a5
Update ReadMe_Overview.txt 3 years ago
Apprentice Harper 77033e1602
Update FAQs.md
update with calibre 5 and new KFX info
3 years ago
Apprentice Harper 15cd372ad9
Update README.md
Update ReadMe for calibre 5 and new KFX DRM
3 years ago
Apprentice Harper c52e4db3df Python 3 fix for old ereader PDB DRM removal 3 years ago
Apprentice Harper 45038cc77b Python 3 fix for epubtest.py that detects version of DRM used 3 years ago
Apprentice Harper 5ec9c98a0b Python 3 fixes for Android kindle key retrieval 3 years ago
xxyzz 66bab7bd7d
using byte string in kfxdedrm.py 3 years ago
Apprentice Harper e0c7d7d382 Revert "PyCrypto requires RSA values to be long"
This reverts commit a1703e15d4.
3 years ago
Apprentice Harper f12a4f3856 Revert to byte arrays for maps on PC, and so fix for Mac which still used byte arrays. Remove some unused code. 3 years ago
Apprentice Harper 87881659c4
Merge pull request #1362 from ivan-m/pycrypto_rsa_long
PyCrypto requires RSA values to be long not int (which is possible for small numbers)
3 years ago
Apprentice Harper dbc7f26097
Merge pull request #1357 from task-hazy/python_3_cli_linux
Adjust wineutils to better call wine python
3 years ago
Apprentice Harper c58e82d97f
Merge pull request #1354 from ableeker/python3
Python3 customisation dialog
3 years ago
Aldo Bleeker 74bcf33591 Python 3 fixes 3 years ago
Ivan Lazar Miljenovic a1703e15d4 PyCrypto requires RSA values to be long
This is at least true for PyCrypto 2.6.1
4 years ago
Task Hazy 591448d1f5 Adjust wineutils to better call wine python
Separate out logic to find correct python executable, and change to not
do shell call with subprocess
4 years ago
Aldo Bleeker a74f37c79e Minor Python 3 fix for Customize dialog 4 years ago
Aldo Bleeker 7f4e6698ef More Python 3 fixes for Customize plugin dialog 4 years ago
Apprentice Harper e2e19fb50f
Merge pull request #1348 from fireattack/master
Convert all to bytes first before concat (fix for Windows routine)
4 years ago
fireattack 4a319a3522 Convert all to bytes first before concat 4 years ago