Remove fallback to md5 module
All supported versions now include the hashlib module.
This commit is contained in:
parent
b5fb4292c9
commit
4d66fbe8c3
@ -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
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user