prevent ImportErrors when requests is missing

samizdatco · samizdatco · commit fc47aa2da32c · 2015-07-05T17:18:49.000-04:00
- the only command the lack of an http library should affect is read()
- will now only trigger an exception if read(some_url) is called but
requests hasn’t been installed
- also means setup.py doesn’t need to check on the build/lib dir before
running tests
diff --git a/plotdevice/run/__init__.py b/plotdevice/run/__init__.py
@@ -11,8 +11,7 @@
 
     # add our embedded PyObjC site-dir to the sys.path (and remove any conflicts)
     map(sys.path.remove, filter(lambda p:p.endswith('PyObjC'), sys.path))
-    if exists(objc_dir):
-        site.addsitedir(objc_dir)
+    site.addsitedir(objc_dir)
 
     # test the sys.path by attempting to load a PyObjC submodule
     import objc
diff --git a/plotdevice/util/readers.py b/plotdevice/util/readers.py
@@ -1,11 +1,13 @@
 # encoding: utf-8
 import os, sys, re
 from operator import attrgetter
+PY2 = sys.version_info[0] == 2
 
 # files & io
 from io import open, StringIO, BytesIO
 from os.path import abspath, dirname, exists, join, splitext
 from plotdevice import DeviceError, INTERNAL
+text_type = str if not PY2 else unicode
 
 # data formats
 import json, csv
@@ -14,33 +16,8 @@
 from xml.parsers import expat
 
 # http
-import requests
 from urlparse import urlparse
 from Foundation import NSDateFormatter, NSLocale, NSTimeZone, NSDate
-from cachecontrol import CacheControl, CacheControlAdapter
-from cachecontrol.caches import FileCache
-from cachecontrol.heuristics import LastModified
-
-PY2 = sys.version_info[0] == 2
-text_type = str if not PY2 else unicode
-
-### HTTP utils ###
-
-cache_dir = '%s/Library/Caches/PlotDevice'%os.environ['HOME']
-HTTP = CacheControl(requests.Session(), cache=FileCache(cache_dir), heuristic=LastModified())
-
-_nsdf = NSDateFormatter.alloc().init()
-_nsdf.setLocale_(NSLocale.alloc().initWithLocaleIdentifier_("en_US_POSIX"))
-_nsdf.setDateFormat_("EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss zzz")
-_nsdf.setTimeZone_(NSTimeZone.timeZoneForSecondsFromGMT_(0))
-
-def last_modified(resp):
-    """Return the last modified date as a unix time_t"""
-    last_mod = _nsdf.dateFromString_(resp.headers.get('Last-Modified'))
-    if not last_mod:
-        last_mod = NSDate.date()
-    return last_mod.timeIntervalSince1970()
-
 
 
 ### XML handling ###
@@ -211,6 +188,45 @@ def csv_dialect(fd):
     return csv.Sniffer().sniff(snippet)
 
 
+### HTTP utils ###
+
+try:
+    import requests
+    from cachecontrol import CacheControl, CacheControlAdapter
+    from cachecontrol.caches import FileCache
+    from cachecontrol.heuristics import LastModified
+
+    cache_dir = '%s/Library/Caches/PlotDevice'%os.environ['HOME']
+    HTTP = CacheControl(requests.Session(), cache=FileCache(cache_dir), heuristic=LastModified())
+except ImportError:
+    class Decoy(object):
+        def get(self, url):
+            unsupported = 'could not find the "requests" library (try running "python setup.py dev" first)'
+            raise RuntimeError(unsupported)
+    HTTP = Decoy()
+
+def binaryish(content, format):
+    bin_types = ('pdf','eps','png','jpg','jpeg','gif','tiff','tif','zip','tar','gz')
+    bin_formats = ('raw','bytes','img','image')
+    if any(b in content for b in bin_types):
+        return True
+    if format:
+        return any(b in format for b in bin_types+bin_formats)
+    return False
+
+_nsdf = NSDateFormatter.alloc().init()
+_nsdf.setLocale_(NSLocale.alloc().initWithLocaleIdentifier_("en_US_POSIX"))
+_nsdf.setDateFormat_("EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss zzz")
+_nsdf.setTimeZone_(NSTimeZone.timeZoneForSecondsFromGMT_(0))
+
+def last_modified(resp):
+    """Return the last modified date as a unix time_t"""
+    last_mod = _nsdf.dateFromString_(resp.headers.get('Last-Modified'))
+    if not last_mod:
+        last_mod = NSDate.date()
+    return last_mod.timeIntervalSince1970()
+
+
 ### File/URL Reader ###
 
 def read(pth, format=None, encoding=None, cols=None, **kwargs):
@@ -280,12 +296,3 @@ def read(pth, format=None, encoding=None, cols=None, **kwargs):
     else:
         return fd.read()
 
-def binaryish(content, format):
-    bin_types = ('pdf','eps','png','jpg','jpeg','gif','tiff','tif','zip','tar','gz')
-    bin_formats = ('raw','bytes','img','image')
-    if any(b in content for b in bin_types):
-        return True
-    if format:
-        return any(b in format for b in bin_types+bin_formats)
-    return False
-
diff --git a/setup.py b/setup.py
@@ -47,8 +47,10 @@
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: MIT License",
     "Operating System :: MacOS :: MacOS X",
+    "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 2 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.4",
     "Topic :: Artistic Software",
     "Topic :: Multimedia :: Graphics",
     "Topic :: Multimedia :: Graphics :: Editors :: Vector-Based",
@@ -217,12 +219,10 @@ def initialize_options(self):
     def finalize_options(self):
         pass
     def run(self):
-        try:
-            import plotdevice.lib
-        except ImportError:
-            unbuilt = 'Build the c-extensions with "python setup.py dev" before running tests.'
-            raise ImportError(unbuilt)
-        self.spawn([sys.executable, '-m', 'tests'])
+        from subprocess import call
+        test_cmd = [sys.executable, '-m', 'tests']
+        print(" ".join(test_cmd))
+        call(test_cmd)
 
 class BuildAppCommand(Command):
     description = "Build PlotDevice.app with xcode"
