Remove fallback to md5 module

All supported versions now include the hashlib module.
This commit is contained in:
Nick Hall 2015-03-16 14:15:47 +00:00
parent b5fb4292c9
commit 4d66fbe8c3
4 changed files with 4 additions and 16 deletions

View File

@ -29,10 +29,7 @@ Handles generation and access to thumbnails used in GRAMPS.
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import logging import logging
try: from hashlib import md5
from hashlib import md5
except ImportError:
from md5 import md5
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -62,10 +62,7 @@ ODFDoc : used to generate Open Office Document
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
try: from hashlib import md5
from hashlib import md5
except ImportError:
from md5 import md5
import zipfile import zipfile
import time import time
from io import StringIO from io import StringIO

View File

@ -34,10 +34,7 @@ This is the research tool, not the low-level data ingerity check.
import os import os
import pickle import pickle
try: from hashlib import md5
from hashlib import md5
except ImportError:
from md5 import md5
from gramps.gen.errors import WindowActiveError from gramps.gen.errors import WindowActiveError
#------------------------------------------------------------------------ #------------------------------------------------------------------------

View File

@ -71,10 +71,7 @@ import os
import sys import sys
import re import re
import copy import copy
try: from hashlib import md5
from hashlib import md5
except ImportError:
from md5 import md5
import time, datetime import time, datetime
import shutil import shutil
import codecs import codecs