559 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Apprentice Harper	2eb31c8fb5	Merge pull request #1275 from jpwhiting/python3fixes ... Python3fixes	2020-10-04 20:07:37 +01:00
Apprentice Harper	a3c7bad67e	Merge pull request #1265 from heindevries/master ... Some changes in obok.py to make it work on windows	2020-10-04 20:04:32 +01:00
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.	2020-10-03 22:36:35 -06:00
Jeremy Whiting	62e0a69089	Fix launching help link from customization dialog. ... To fix error with python3 when launching help link open files in binary mode.	2020-10-03 22:36:35 -06:00
Jeremy Whiting	9df1563492	Use open instead of file() to export keys to file. ... Fixes export of Kindle keys in calibre 5.0.1 here.	2020-10-03 22:36:27 -06:00
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"	2020-10-01 00:16:55 +05:30
keshavgbpecdelhi	cf829db532	wil to will ... typo	2020-10-01 00:05:46 +05:30
keshavgbpecdelhi	80c8bd2d24	prompt and will ... Sorry but typos are typos "promt" should be written as "prompt" and "wil" should be "will"	2020-10-01 00:01:32 +05:30
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.	2020-09-30 23:12:26 +05:30
HdV	f55420bbf4	Merge branch 'master' of https://github.com/heindevries/DeDRM_tools ... merging	2020-09-30 16:56:14 +02:00
HdV	7f758566d3	Changes to make obok work on win ... _winreg renamed to winreg in python 3 os.popen3() replaced by subprocess.Popen()	2020-09-30 16:47:27 +02:00
Apprentice Harper	ff8d44492e	Fix problem on Mac with byte arrays.	2020-09-30 13:25:32 +01:00
Apprentice Harper	21d4811bfe	Merge pull request #1255 from cclauss/patch-2 ... GitHub Action test on both Python 2 and Python 3	2020-09-30 11:45:50 +01:00
Christian Clauss	558efebbff	Update genbook.py	2020-09-28 01:03:30 +02:00
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.	2020-09-28 01:00:21 +02:00
Christian Clauss	3f644ddfd6	print() is a function in Python since 1/1/2020	2020-09-28 00:49:21 +02:00
Christian Clauss	08bdacf476	Fix Python syntax error: add a comma ... Discovered by flake8 running in our GitHub Action	2020-09-28 00:39:57 +02:00
Christian Clauss	109261bdc0	GitHub Action test on both Python 2 and Python 3	2020-09-28 00:36:25 +02:00
Apprentice Harper	de50a02af9	More generic 3.0 changes, to be tested.	2020-09-27 11:54:49 +01:00
Apprentice Harper	6920f79a26	Merge pull request #1248 from kubik147/adobekey ... Make adobekey.py work in Python 3	2020-09-27 10:11:37 +01:00
kubik147	2800f7cd80	Remove the u string prefixes	2020-09-27 00:57:53 +02:00
kubik147	61c5096da0	Make adobekey.py work in Python 3	2020-09-27 00:54:40 +02:00
Apprentice Harper	9118ce77ab	Merge pull request #1170 from Dr-Willy/master ... Fix path in make_release.py	2020-09-26 21:19:48 +01:00
Apprentice Harper	c3aa1b62bb	Merge pull request #1241 from erikbrinkman/patch-1 ... Support ebook-convert	2020-09-26 21:19:17 +01:00
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	2020-09-26 21:22:47 +01:00
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".	2020-09-20 16:43:23 -04:00
Dr-Willy	e76bb408a3	Fix path in make_release.py	2020-07-20 21:07:20 +12:00
Apprentice Harper	4868a7460e	Updates to FAQs and ReadMes	2020-06-18 08:03:20 +01:00
Apprentice Harper	0859f197fc	Update init file, update versions in files, update comments in files	2020-06-18 07:42:41 +01:00
Apprentice Harper	da85d4ffac	Merge pull request #1095 from fondfire/patch-1 ... Create ignoblepdf.py	2020-06-17 16:04:41 +01:00
Apprentice Harper	6fd5535072	Merge pull request #1091 from vanicat/inetepub-python3 ... Inetepub python3	2020-06-17 15:57:27 +01:00
Apprentice Harper	885ef5e890	Merge pull request #1037 from apprenticesakuya/master ... Finish .kinf2018 support and add KFX v2/v3 support	2020-06-17 15:56:37 +01:00
apprenticesakuya	22d2b37e04	Support KFX VoucherEnvelope versions 2 and 3	2020-06-16 01:19:15 +00:00
apprenticesakuya	837562db66	Support .kinf2018 on Mac	2020-06-11 17:26:36 +00:00
fondfire	3dcf3a5483	Create ignoblepdf.py ... New Python 2 program to decrypt Barnes & Noble encrypted PDF files.	2020-05-15 22:08:30 -05:00
Rémi Vanicat	f7b4efc3e1	More handling of difference between python2 and python3 ... Place where python3 use bytes/int and python2 str/str	2020-05-08 18:09:27 +02:00
Rémi Vanicat	2fbf2c1c5f	decoding from base64 in a portable way	2020-05-08 18:09:27 +02:00
Rémi Vanicat	3166273622	modernizing ineptepub. ... decrypting as python2 work failing with python3: File "ineptepub.py", line 424, in decryptBook bookkey = rsa.decrypt(bookkey.decode('base64')) AttributeError: 'str' object has no attribute 'decode'	2020-05-08 18:09:27 +02:00
apprenticesakuya	ea916d85fc	Finish .kinf2018 support	2020-03-27 13:01:09 -07:00
Apprentice Harper	2bb73584f2	merge of translations	2020-02-17 12:07:35 +00:00
Apprentice Harper	8495ebe36d	Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools	2020-02-17 12:06:23 +00:00
Apprentice Harper	92bf51bc8f	Remove stand-alone apps. Only support the two plugins.	2020-02-16 10:12:25 +00:00
Apprentice Harper	e15ff385ca	Merge pull request #989 from jony0008/master ... New translation for obok plug-in: Swedish	2020-02-06 12:01:44 +00:00
Apprentice Harper	d48f4b86cf	Merge pull request #988 from ZolaLa9/Update-FAQs-for-Kindle-for-Mac-and-Catalina ... Update FAQs.md for K4Mac and Catalina	2020-02-06 11:59:15 +00:00
Jony	2ef5c59ebe	New translation: Swedish ... I have finished the Swedish translation. Please merge it.	2020-02-02 09:20:52 +01:00
ZolaLa	d2995539f0	Update FAQs.md	2020-02-01 05:22:56 +00:00
Apprentice Harper	ef3c7f261c	Merge pull request #859 from HansChua/linux_handling ... Allow users to specify Kobo directory and add 'ip' command for linux	2020-01-30 12:08:45 +00:00
Apprentice Harper	778ce4782e	Merge branch 'master' into linux_handling	2020-01-30 12:06:38 +00:00
Apprentice Harper	69ac9b7399	Merge pull request #848 from sretlawd/kfx_dsn_fix ... Allow decryption with DSN only.	2020-01-30 12:04:00 +00:00
Apprentice Harper	423dec0309	Merge pull request #847 from aplaice/linux_documentation ... Improve documentation for using Kindle for PC with Linux in Wine	2020-01-30 12:03:08 +00:00