Merge branch 'Python2' - the DeDRM plugn version change

diff --cc DeDRM_plugin/__init__.py
index cdbd4a975220e435667865c05920ab875b0737a9,cfd91b201c67f796e8bf968b50d3ade8a6bc3545..b27fde92eece6557df5c918c852f5406e2dad34f
--- 1/DeDRM_plugin/__init__.py
--- 2/DeDRM_plugin/__init__.py
+++ b/DeDRM_plugin/__init__.py
@@@ -76,9 -77,9 +76,9 @@@ __docformat__ = 'restructuredtext en
  Decrypt DRMed ebooks.
  """
  
 -PLUGIN_NAME = u"DeDRM"
 +PLUGIN_NAME = "DeDRM"
- PLUGIN_VERSION_TUPLE = (7, 0, 0)
+ PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")])
 -PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 +PLUGIN_VERSION = ".".join([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'