resolved conflicts for merge of a74a4811
to honeycomb-plus-aosp
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
This commit is contained in:
@@ -52,6 +52,11 @@ import subprocess
|
|||||||
import tempfile
|
import tempfile
|
||||||
import zipfile
|
import zipfile
|
||||||
|
|
||||||
|
try:
|
||||||
|
from hashlib import sha1 as sha1
|
||||||
|
except ImportError:
|
||||||
|
from sha import sha as sha1
|
||||||
|
|
||||||
import common
|
import common
|
||||||
|
|
||||||
# Work around a bug in python's zipfile module that prevents opening
|
# Work around a bug in python's zipfile module that prevents opening
|
||||||
|
@@ -29,11 +29,9 @@ import time
|
|||||||
import zipfile
|
import zipfile
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import hashlib
|
from hashlib import sha1 as sha1
|
||||||
sha1 = hashlib.sha1
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
import sha
|
from sha import sha as sha1
|
||||||
sha1 = sha.sha
|
|
||||||
|
|
||||||
# missing in Python 2.4 and before
|
# missing in Python 2.4 and before
|
||||||
if not hasattr(os, "SEEK_SET"):
|
if not hasattr(os, "SEEK_SET"):
|
||||||
|
@@ -63,6 +63,11 @@ import tempfile
|
|||||||
import time
|
import time
|
||||||
import zipfile
|
import zipfile
|
||||||
|
|
||||||
|
try:
|
||||||
|
from hashlib import sha1 as sha1
|
||||||
|
except ImportError:
|
||||||
|
from sha import sha as sha1
|
||||||
|
|
||||||
import common
|
import common
|
||||||
import edify_generator
|
import edify_generator
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user