575 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Apprentice Harper	d3c7388327	Merge pull request #1389 from ableeker/python3 ... Python 3 fixes for __init__.py	2020-11-29 16:35:46 +00:00
Aldo Bleeker	8e436ad920	Python 3 fixes fort correct version of __init__.py	2020-11-29 16:54:45 +01:00
Aldo Bleeker	ae806f734e	Python 3 fixes for __init__.py	2020-11-29 13:39:04 +01:00
Apprentice Harper	ccfa454226	Merge branch 'Python2' - the DeDRM plugn version change	2020-11-29 10:47:09 +00:00
Apprentice Harper	6716db1f62	Derive calibre version tuple from __version__ string	2020-11-29 10:40:14 +00:00
Apprentice Harper	0e0d7d8b14	Don't rule out running from the command line	2020-11-28 16:25:54 +00:00
Apprentice Harper	981aadc497	Merge pull request #1380 from xxyzz/byte-string ... Fix byte string error for KFX	2020-11-28 16:19:17 +00:00
Apprentice Harper	26eb5d676c	Merge branch 'Python2' Bring across version number updates from 6.8.1 release	2020-11-28 16:18:09 +00:00
Apprentice Harper	464788a3f1	Update DeDRM version number to 6.8.1, and kindlekey to 2.8	2020-11-28 16:11:17 +00:00
Apprentice Harper	036f9007fd	Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur	2020-11-28 16:07:31 +00:00
Apprentice Harper	bdd1c2e474	Merge pull request #1383 from ableeker/python3 ... Python 3 fixes for Barnes&Noble	2020-11-28 15:47:22 +00:00
Apprentice Harper	54a58d05a5	Merge pull request #1382 from koumaza/koumaza/refine-github-actions-workflow ... Refine GitHub Actions Workflow	2020-11-28 15:45:43 +00:00
Apprentice Harper	218539f131	Merge pull request #1381 from protochron/fix_big_sur_python_2 ... Fix loading libcrypto on OSX Big Sur	2020-11-28 15:44:42 +00:00
Aldo Bleeker	f9d9b6016f	Python 3 fixes for Barnes&Noble	2020-11-28 14:49:27 +01:00
shanghai yakisoba chan!	131cea1215	Update Format.yaml: Change execution condition of workflow ... Execute format workflow only if there is `!format` in the commit message.	2020-11-28 21:39:27 +09:00
shanghai yakisoba chan!	731eeac087	Refine gh-actions ... * Update and rename Python_test.yml to Lint.yaml * Create Format.yaml	2020-11-28 15:48:31 +09:00
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.	2020-11-27 22:28:34 -05:00
xxyzz	b8b324956c	replace bord with ord and some other byte string fix ... PyCryptodome's bord() in Python3 does nothing.	2020-11-28 11:22:27 +08:00
xxyzz	1955b34883	import ion correctly	2020-11-28 11:20:53 +08:00
Apprentice Harper	dbc5c2b4de	Merge pull request #1269 from keshavgbpecdelhi/patch-4 ... using the Kindle & prompt	2020-11-27 19:34:20 +00:00
Apprentice Harper	856fef55be	Merge pull request #1268 from keshavgbpecdelhi/patch-3 ... changing wil to will	2020-11-27 19:34:08 +00:00
Apprentice Harper	f2fa0426b7	Merge pull request #1267 from keshavgbpecdelhi/patch-2 ... prompt and will	2020-11-27 19:33:59 +00:00
Apprentice Harper	c3376cc492	Merge pull request #1266 from keshavgbpecdelhi/patch-1 ... "promt" doesn't make any sense	2020-11-27 19:33:46 +00:00
Apprentice Harper	dc72c368a5	Update ReadMe_Overview.txt	2020-11-27 19:32:25 +00:00
Apprentice Harper	77033e1602	Update FAQs.md ... update with calibre 5 and new KFX info	2020-11-27 19:29:12 +00:00
Apprentice Harper	15cd372ad9	Update README.md ... Update ReadMe for calibre 5 and new KFX DRM	2020-11-27 19:20:44 +00:00
Apprentice Harper	c52e4db3df	Python 3 fix for old ereader PDB DRM removal	2020-11-27 15:51:33 +00:00
Apprentice Harper	45038cc77b	Python 3 fix for epubtest.py that detects version of DRM used	2020-11-27 15:49:57 +00:00
Apprentice Harper	5ec9c98a0b	Python 3 fixes for Android kindle key retrieval	2020-11-27 15:46:06 +00:00
xxyzz	66bab7bd7d	using byte string in kfxdedrm.py	2020-11-27 22:01:18 +08:00
Apprentice Harper	e0c7d7d382	Revert "PyCrypto requires RSA values to be long" ... This reverts commit a1703e15d4.	2020-11-25 08:36:06 +00:00
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.	2020-11-23 14:22:48 +00:00
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)	2020-11-23 13:31:10 +00:00
Apprentice Harper	dbc7f26097	Merge pull request #1357 from task-hazy/python_3_cli_linux ... Adjust wineutils to better call wine python	2020-11-23 13:28:29 +00:00
Apprentice Harper	c58e82d97f	Merge pull request #1354 from ableeker/python3 ... Python3 customisation dialog	2020-11-23 13:26:27 +00:00
Aldo Bleeker	74bcf33591	Python 3 fixes	2020-11-22 16:03:45 +01:00
Ivan Lazar Miljenovic	a1703e15d4	PyCrypto requires RSA values to be long ... This is at least true for PyCrypto 2.6.1	2020-11-11 20:51:19 +08:00
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	2020-11-09 16:51:13 -07:00
Aldo Bleeker	a74f37c79e	Minor Python 3 fix for Customize dialog	2020-11-07 13:43:58 +01:00
Aldo Bleeker	7f4e6698ef	More Python 3 fixes for Customize plugin dialog	2020-11-06 23:49:18 +01:00
Apprentice Harper	e2e19fb50f	Merge pull request #1348 from fireattack/master ... Convert all to bytes first before concat (fix for Windows routine)	2020-11-05 10:51:56 +00:00
fireattack	4a319a3522	Convert all to bytes first before concat	2020-11-02 02:09:52 -06:00
Apprentice Harper	f1ef1b8ecd	Merge pull request #1340 from ableeker/python3 ... Python 3 fixes config.py alfcrypto.py	2020-10-29 14:09:28 +00:00
Apprentice Harper	af0acf31a3	Merge pull request #1338 from ivan-m/wine_pythonpath ... Set PYTHONPATH="" when running through wine	2020-10-29 14:06:53 +00:00
Aldo	6dd022e6a0	Python 3 fixes config.py alfcrypto.py	2020-10-28 18:54:33 +01:00
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).	2020-10-27 13:34:16 +08:00
Apprentice Harper	019abecd05	Merge pull request #1333 from jpwhiting/fixwinreg ... Fixwinreg - thanks, these all look useful and good.	2020-10-22 13:56:05 +01:00
Apprentice Harper	7b3bbbd008	Merge pull request #1331 from koumaza/koumaza/issue-template ... Create Question Issue Template	2020-10-22 13:54:11 +01:00
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	2020-10-22 13:53:01 +01:00
Jeremy Whiting	e0ec691dd6	Fix another exception thrown when unable to find kindle keys.	2020-10-21 10:56:58 -06:00