Merge pull request #308 from ciromattia/dev

5.5.1
ciromattia · Mar 8, 2019 · 35bba68 · 35bba68
2 parents a6f9e84 + 0b056a8
commit 35bba68
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # CHANGELOG
+#### 5.5.1:
+* Fixes some stability issues 
+
 #### 5.5.0:
 * Added support for WebP format
 * Added profiles for Kindle Paperwhite 4 and Kobo Forma

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  PYTHON: "C:\\Python36-x64"
+  PYTHON: "C:\\Python37-x64"
 
 install:
   - set PATH="%PYTHON%\\Scripts";"C:\\Program Files (x86)\\Inno Setup 5";%PATH%

diff --git a/kcc-c2e.py b/kcc-c2e.py
@@ -23,9 +23,10 @@
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-from multiprocessing import freeze_support
+from multiprocessing import freeze_support, set_start_method
 from kindlecomicconverter.startup import startC2E
 
 if __name__ == "__main__":
+    set_start_method('spawn')
     freeze_support()
     startC2E()
diff --git a/kcc-c2p.py b/kcc-c2p.py
@@ -23,9 +23,10 @@
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-from multiprocessing import freeze_support
+from multiprocessing import freeze_support, set_start_method
 from kindlecomicconverter.startup import startC2P
 
 if __name__ == "__main__":
+    set_start_method('spawn')
     freeze_support()
     startC2P()
diff --git a/kcc.iss b/kcc.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "5.5.0"
+#define MyAppVersion "5.5.1"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"

diff --git a/kcc.py b/kcc.py
@@ -28,12 +28,12 @@
 if sys.platform.startswith('darwin'):
     if getattr(sys, 'frozen', False):
         os.environ['PATH'] = os.path.dirname(os.path.abspath(sys.executable)) + \
-            '/../Resources:/usr/local/bin:/usr/bin:/bin'
+                             '/../Resources:/usr/local/bin:/usr/bin:/bin'
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources')
         os.system('defaults write com.kindlecomicconverter.KindleComicConverter ApplePersistenceIgnoreState YES')
         os.system('defaults write com.kindlecomicconverter.KindleComicConverter NSInitialToolTipDelay -int 1000')
     else:
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/osx/:' + os.environ['PATH']
+        os.chdir(os.path.dirname(os.path.abspath(__file__)))
 elif sys.platform.startswith('win'):
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
@@ -47,10 +47,11 @@
     except ImportError:
         pass
 
-from multiprocessing import freeze_support
+from multiprocessing import freeze_support, set_start_method
 from kindlecomicconverter.startup import start
 
 if __name__ == "__main__":
+    set_start_method('spawn')
     freeze_support()
     start()
 
diff --git a/kindlecomicconverter/__init__.py b/kindlecomicconverter/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '5.5.0'
+__version__ = '5.5.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2019, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
diff --git a/kindlecomicconverter/shared.py b/kindlecomicconverter/shared.py
@@ -87,12 +87,12 @@ def sanitizeTrace(traceback):
     return ''.join(format_tb(traceback))\
         .replace('C:/projects/kcc/', '')\
         .replace('c:/projects/kcc/', '')\
-        .replace('C:/python36-x64/', '')\
-        .replace('c:/python36-x64/', '')\
+        .replace('C:/python37-x64/', '')\
+        .replace('c:/python37-x64/', '')\
         .replace('C:\\projects\\kcc\\', '')\
         .replace('c:\\projects\\kcc\\', '')\
-        .replace('C:\\python36-x64\\', '')\
-        .replace('c:\\python36-x64\\', '')
+        .replace('C:\\python37-x64\\', '')\
+        .replace('c:\\python37-x64\\', '')
 
 
 # noinspection PyUnresolvedReferences

diff --git a/other/osx/Info.plist b/other/osx/Info.plist
@@ -30,7 +30,7 @@
 	<key>CFBundleExecutable</key>
 	<string>MacOS/Kindle Comic Converter</string>
 	<key>CFBundleGetInfoString</key>
-	<string>KindleComicConverter 5.5.0, written 2012-2019 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
+	<string>KindleComicConverter 5.5.1, written 2012-2019 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
 	<key>CFBundleIconFile</key>
 	<string>comic2ebook.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -42,11 +42,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.5.0</string>
+	<string>5.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.0</string>
+	<string>5.5.1</string>
 	<key>LSEnvironment</key>
 	<dict>
 		<key>PATH</key>