move getimagesize into utils

And now the tools directory is no longer needed.

Author: ikirudennis

tests/test_getimagesize.py

@@ -1,4 +1,4 @@
-from textile.tools.imagesize import getimagesize
+from textile.utils import getimagesize
 import pytest
 
 PIL = pytest.importorskip('PIL')

tests/test_imagesize.py

@@ -3,7 +3,7 @@
 
 def test_imagesize():
     imgurl = 'http://www.google.com/intl/en_ALL/images/srpr/logo1w.png'
-    result = textile.tools.imagesize.getimagesize(imgurl)
+    result = textile.utils.getimagesize(imgurl)
     try:
         import PIL  # noqa: F401
 

textile/core.py

@@ -20,13 +20,12 @@
 from collections import OrderedDict
 from nh3 import clean
 
-from textile.tools import imagesize
 from textile.regex_strings import (align_re_s, cls_re_s, pnct_re_s,
                                    regex_snippets, syms_re_s, table_span_re_s)
 from textile.utils import (decode_high, encode_high, encode_html, generate_tag,
-                           has_raw_text, human_readable_url, is_rel_url,
-                           is_valid_url, list_type, normalize_newlines,
-                           parse_attributes, pba)
+                           getimagesize, has_raw_text, human_readable_url,
+                           is_rel_url, is_valid_url, list_type,
+                           normalize_newlines, parse_attributes, pba)
 from textile.objects import Block, Table
 
 try:
@@ -1152,7 +1151,7 @@ def fImage(self, match):
             title = ''
 
         if not is_rel_url(url) and self.get_sizes:
-            size = imagesize.getimagesize(url)
+            size = getimagesize(url)
 
         if href:
             href = self.shelveURL(href)

textile/textilefactory.py

@@ -20,10 +20,7 @@ def __init__(self, restricted=False, lite=False, sanitize=False,
             self.method_parms['rel'] = 'nofollow'
 
         if noimage is None:
-            if restricted:
-                noimage = True
-            else:
-                noimage = False
+            noimage = bool(restricted)
 
         self.class_parms['noimage'] = noimage
         self.method_parms['sanitize'] = sanitize

textile/tools/__init__.py

@@ -79,6 +79,35 @@ def generate_tag(tag, content, attributes=None):
     return element_text
 
 
+def getimagesize(url):
+    """
+    Attempts to determine an image's width and height, and returns a tuple,
+    (width, height), in pixels or an empty string in case of failure.
+    Requires that PIL is installed.
+
+    """
+
+    try:
+        from PIL import ImageFile
+    except ImportError:
+        return ''
+
+    from urllib.request import urlopen
+
+    try:
+        p = ImageFile.Parser()
+        f = urlopen(url)
+        while True:
+            s = f.read(1024)
+            if not s:
+                break
+            p.feed(s)
+            if p.image:
+                return p.image.size
+    except (IOError, ValueError):
+        return ''
+
+
 def has_raw_text(text):
     """checks whether the text has text not already enclosed by a block tag"""
     r = text.strip()