mirror of https://github.com/scrapy/scrapy.git
migrated all sha to hashlib
--HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%4083
This commit is contained in:
parent
ce905ce78f
commit
76a9d2da10
|
|
@ -1,7 +1,7 @@
|
|||
from __future__ import with_statement
|
||||
|
||||
import os
|
||||
import sha
|
||||
import hashlib
|
||||
import datetime
|
||||
import urlparse
|
||||
from pydispatch import dispatcher
|
||||
|
|
@ -83,7 +83,7 @@ class Cache(object):
|
|||
os.makedirs(self.basesectorpath)
|
||||
|
||||
def domainsectorpath(self, domain):
|
||||
sector = sha.sha(domain).hexdigest()[0]
|
||||
sector = hashlib.sha1(domain).hexdigest()[0]
|
||||
return os.path.join(self.basesectorpath, sector, domain)
|
||||
|
||||
def domainlinkpath(self, domain):
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import sha
|
||||
import hashlib
|
||||
from datetime import datetime
|
||||
|
||||
from pydispatch import dispatcher
|
||||
|
|
@ -84,4 +84,4 @@ def urlkey(url):
|
|||
|
||||
|
||||
def hash(value):
|
||||
return sha.new(value).hexdigest() if value else None
|
||||
return hashlib.sha1(value).hexdigest() if value else None
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ This module contains some extra base models for scraped items which could be
|
|||
useful in some Scrapy implementations
|
||||
"""
|
||||
|
||||
import sha
|
||||
import hashlib
|
||||
|
||||
from scrapy.item import ScrapedItem
|
||||
from scrapy.core.exceptions import UsageError, DropItem
|
||||
|
|
@ -135,6 +135,6 @@ class RobustScrapedItem(ScrapedItem):
|
|||
"""
|
||||
if self._version:
|
||||
return self._version
|
||||
hash_ = sha.new()
|
||||
hash_ = hashlib.sha1()
|
||||
hash_.update("".join(["".join([n, str(v)]) for n,v in sorted(self.__dict__.iteritems())]))
|
||||
return hash_.hexdigest()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import re
|
||||
import urllib
|
||||
import simplejson
|
||||
from sha import sha
|
||||
import hashlib
|
||||
from twisted.internet import defer
|
||||
|
||||
from scrapy.core.engine import scrapyengine
|
||||
|
|
@ -22,7 +22,7 @@ CACHESIZE = settings.get('WS_CACHESIZE', 20)
|
|||
|
||||
|
||||
def _urlhash(request):
|
||||
h = sha()
|
||||
h = hashlib.sha1()
|
||||
for a in sorted(request.ARGS):
|
||||
h.update(request.ARGS[a])
|
||||
return h.hexdigest()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import urllib
|
||||
import warnings
|
||||
from hashlib import sha1
|
||||
import hashlib
|
||||
from copy import copy
|
||||
from base64 import urlsafe_b64encode
|
||||
|
||||
|
|
@ -149,7 +149,7 @@ class Request(object):
|
|||
headers = dict([(k, v) for k, v in self.headers.items() if k.lower() not in keys])
|
||||
|
||||
# fingerprint generation
|
||||
fp = sha1()
|
||||
fp = hashlib.sha1()
|
||||
fp.update(canonicalize(self.url))
|
||||
fp.update(self.method)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import re
|
||||
import sha
|
||||
import hashlib
|
||||
import copy
|
||||
|
||||
from BeautifulSoup import UnicodeDammit
|
||||
|
|
@ -41,7 +41,7 @@ class Response(object) :
|
|||
def version(self):
|
||||
"""A hash of the contents of this response"""
|
||||
if not hasattr(self, '_version'):
|
||||
self._version = sha.new(self.body.to_string()).hexdigest()
|
||||
self._version = hashlib.sha1(self.body.to_string()).hexdigest()
|
||||
return self._version
|
||||
|
||||
def headers_encoding(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue