osx is 3.7 now

ctl

@@ -58,7 +58,7 @@ else
     fi
     if [ $SYSTEM == "Darwin" ]; then
         PLATFORM="darwin64"
-        PLATFORM_PYTHON=3.5
+        PLATFORM_PYTHON=3.7
     fi
     export PLATFORM_ENV="$BASE/platform_${PLATFORM}"
 fi

oml/library.py

@@ -217,7 +217,7 @@ class Peer(object):
         getpreview = []
         t0 = time.time()
         if remove:
-            logger.debug('remove %s items', len(remove))
+            logger.debug('remove %s items from %s', len(remove), self.id)
             q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove))
             state.db.session.execute(q)
             q = user.models.list_items.delete().where(l_list_id.in_(lists)).where(l_item_id.in_(remove))
@@ -231,7 +231,7 @@ class Peer(object):
             listitems[row['list_id']].add(row['item_id'])
         t0 = maybe_commit(t0)
         if add:
-            logger.debug('add %s items', len(add))
+            logger.debug('add %s items from %s', len(add), self.id)
             t0 = time.time()
             q = item.models.user_items.select().where(c_user_id.is_(self.id))
             useritems = {r['item_id'] for r in state.db.session.execute(q)}

oml/localnodes.py

@@ -155,4 +155,4 @@ class LocalNodes(dict):
 
     def get(self, user_id):
         if user_id in self and can_connect(self[user_id]):
-            return self[user_id]
+            return self.get(user_id)

oml/utils.py

@@ -4,7 +4,7 @@
 
 from datetime import datetime
 from io import StringIO, BytesIO
-from PIL import Image
+from PIL import Image, ImageFile
 import base64
 import hashlib
 import json
@@ -34,6 +34,7 @@ import logging
 logging.getLogger('PIL').setLevel(logging.ERROR)
 logger = logging.getLogger(__name__)
 
+ImageFile.LOAD_TRUNCATED_IMAGES = True
 ENCODING = 'base64'
 
 def valid_olid(id):
@@ -69,7 +70,8 @@ def resize_image(data, width=None, size=None):
         data = StringIO(data)
     source = Image.open(data)
     #if source.mode not in ('1', 'CMYK', 'L', 'RGB', 'RGBA', 'RGBX', 'YCbCr'):
-    source = source.convert('RGB')
+    if source.mode != 'RGB':
+        source = source.convert('RGB')
     source_width = source.size[0]
     source_height = source.size[1]
     if size: