Remove debugging dialog from Mac App. Update version to 6.5.1

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -56,9 +56,9 @@
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
-		<real>652</real>
+		<real>651</real>
 		<key>savedFrame</key>
-		<string>0 36 1680 991 0 0 1680 1027 </string>
+		<string>0 37 1680 990 0 0 1680 1027 </string>
 		<key>selectedTab</key>
 		<string>log</string>
 	</dict>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py

@@ -54,15 +54,14 @@
 #   6.5.0 - Big update to Macintosh app
 #           Fix for some more 'new' tags in Topaz ebooks.
 #           Fix an error in wineutils.py
-#   6.5.1 - Updated version number, added PDF check for DRM-free documents
 
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 5, 1)
+PLUGIN_VERSION_TUPLE = (6, 5, 0)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py

@@ -57,15 +57,14 @@
 #   8.0.2 - Add additional check on DER file sanity
 #   8.0.3 - Remove erroneous check on DER file sanity
 #   8.0.4 - Completely remove erroneous check on DER file sanity
-#   8.0.5 - Do not process DRM-free documents
 
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.5"
+__version__ = "8.0.4"
 
 import sys
 import os
@@ -1469,7 +1468,6 @@ def initialize(self, password=''):
         if not self.encryption:
             self.is_printable = self.is_modifiable = self.is_extractable = True
             self.ready = True
-            raise PDFEncryptionError('Document is not encrypted.')
             return
         (docid, param) = self.encryption
         type = literal_name(param['Filter'])
@@ -2182,11 +2180,11 @@ def decryptBook(userkey, inpath, outpath):
     if RSA is None:
         raise ADEPTError(u"PyCrypto or OpenSSL must be installed.")
     with open(inpath, 'rb') as inf:
-        #try:
-        serializer = PDFSerializer(inf, userkey)
-        #except:
-        #    print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
-        #    return 2
+        try:
+            serializer = PDFSerializer(inf, userkey)
+        except:
+            print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
+            return 2
         # hope this will fix the 'bad file descriptor' problem
         with open(outpath, 'wb') as outf:
             # help construct to make sure the method runs to the end