From 220ced163c2013368311931c00ef7f72e4116371 Mon Sep 17 00:00:00 2001
From: Max Arnold <arnold.maxim@gmail.com>
Date: Tue, 17 Dec 2013 23:19:40 +0700
Subject: [PATCH] simplify porting to Python 3

---
 scrapy/contrib/pipeline/files.py  | 2 +-
 scrapy/contrib/pipeline/images.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scrapy/contrib/pipeline/files.py b/scrapy/contrib/pipeline/files.py
index 98fbd948c..b7b1a7d66 100644
--- a/scrapy/contrib/pipeline/files.py
+++ b/scrapy/contrib/pipeline/files.py
@@ -276,7 +276,7 @@ class FilesPipeline(MediaPipeline):
                           category=ScrapyDeprecationWarning, stacklevel=1)
 
         # check if called from file_key with url as first argument
-        if isinstance(request, unicode) or isinstance(request, str):
+        if not isinstance(request, Request):
             _warn()
             url = request
         else:
diff --git a/scrapy/contrib/pipeline/images.py b/scrapy/contrib/pipeline/images.py
index 5020afa26..be3065179 100644
--- a/scrapy/contrib/pipeline/images.py
+++ b/scrapy/contrib/pipeline/images.py
@@ -118,7 +118,7 @@ class ImagesPipeline(FilesPipeline):
                           category=ScrapyDeprecationWarning, stacklevel=1)
 
         # check if called from image_key or file_key with url as first argument
-        if isinstance(request, unicode) or isinstance(request, str):
+        if not isinstance(request, Request):
             _warn()
             url = request
         else:
@@ -146,7 +146,7 @@ class ImagesPipeline(FilesPipeline):
                           category=ScrapyDeprecationWarning, stacklevel=1)
 
         # check if called from thumb_key with url as first argument
-        if isinstance(request, unicode) or isinstance(request, str):
+        if not isinstance(request, Request):
             _warn()
             url = request
         else: