[sitemap] resolve several ScrapyDeprecationWarning exceptions

Change-Id: Ie87e6c316eecd45006332088912b31809b4c9679

sitemap/generator/settings.py

@@ -16,7 +16,7 @@
 # All available configuration variables are documente at
 # http://doc.scrapy.org/en/latest/topics/settings.html.
 
-from scrapy import linkextractor
+from scrapy import linkextractors
 
 BOT_NAME = 'sitemap'
 SPIDER_MODULES = ['generator.spiders']
@@ -31,4 +31,4 @@ LOG_LEVEL = 'INFO'
 LOGGING_ENABLED = True
 RANDOMIZE_DOWNLOAD_DELAY = False
 TELNETCONSOLE_ENABLED = False
-linkextractor.IGNORED_EXTENSIONS.remove('pdf')
+linkextractors.IGNORED_EXTENSIONS.remove('pdf')

sitemap/generator/spiders/sitemap.py

@@ -15,8 +15,8 @@ import time
 import urlparse
 
 from generator import items
-from scrapy.contrib.linkextractors import sgml
-from scrapy.contrib import spiders
+from scrapy.linkextractors import sgml
+from scrapy import spiders
 
 
 class SitemapSpider(spiders.CrawlSpider):