s/import Image/from PIL import Image/g

This commit is contained in:
j 2016-06-25 20:36:20 +02:00
parent 4785f314cb
commit 2cec1b9ad5
14 changed files with 21 additions and 21 deletions

View file

@ -29,7 +29,7 @@
apt-get install git subversion mercurial \ apt-get install git subversion mercurial \
python-setuptools python-pip python-virtualenv ipython \ python-setuptools python-pip python-virtualenv ipython \
python-dev python-imaging python-numpy python-psycopg2 \ python-dev python-pil python-numpy python-psycopg2 \
python-geoip python-html5lib python-lxml \ python-geoip python-html5lib python-lxml \
postgresql postgresql-contrib rabbitmq-server \ postgresql postgresql-contrib rabbitmq-server \
poppler-utils mkvtoolnix gpac imagemagick \ poppler-utils mkvtoolnix gpac imagemagick \

View file

@ -15,11 +15,11 @@ from distutils.spawn import find_executable
from glob import glob from glob import glob
import numpy as np import numpy as np
import Image
import ox import ox
import ox.image import ox.image
from ox.utils import json from ox.utils import json
from django.conf import settings from django.conf import settings
from PIL import Image
img_extension = 'jpg' img_extension = 'jpg'

View file

@ -11,7 +11,7 @@ from django.db.models import Max
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models.signals import pre_delete from django.db.models.signals import pre_delete
import Image from PIL import Image
import ox import ox
from item.models import Item from item.models import Item

View file

@ -6,7 +6,7 @@ import math
import os import os
import re import re
import Image from PIL import Image
from ox.utils import json from ox.utils import json

View file

@ -8,7 +8,7 @@ from urlparse import urlparse
from urllib import quote from urllib import quote
import time import time
import Image from PIL import Image
from django.db.models import Count, Sum from django.db.models import Count, Sum
from django.http import HttpResponse, HttpResponseForbidden, Http404 from django.http import HttpResponse, HttpResponseForbidden, Http404
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render

View file

@ -1,9 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
from __future__ import division from __future__ import division
import Image
import os import os
from PIL import Image
ZONE_INDEX = [] ZONE_INDEX = []
for pixel_index in range(64): for pixel_index in range(64):
x, y = pixel_index % 8, int(pixel_index / 8) x, y = pixel_index % 8, int(pixel_index / 8)

View file

@ -10,7 +10,7 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
from optparse import OptionParser from optparse import OptionParser
import sys import sys

View file

@ -10,8 +10,8 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
from optparse import OptionParser from optparse import OptionParser
from ox.image import drawText, wrapText from ox.image import drawText, wrapText
import sys import sys

View file

@ -10,8 +10,8 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
#activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') #activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
#execfile(activate_this, dict(__file__=activate_this)) #execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
import json import json
from optparse import OptionParser from optparse import OptionParser
import ox import ox

View file

@ -11,8 +11,8 @@ activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import hashlib import hashlib
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
import json import json
from optparse import OptionParser from optparse import OptionParser
import ox import ox

View file

@ -10,8 +10,8 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
import json import json
from optparse import OptionParser from optparse import OptionParser
import ox import ox

View file

@ -10,8 +10,8 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
import json import json
from optparse import OptionParser from optparse import OptionParser
import ox import ox

View file

@ -10,8 +10,8 @@ root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file_
activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') activate_this = os.path.join(root_dir, 'bin', 'activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) execfile(activate_this, dict(__file__=activate_this))
import Image from PIL import Image
import ImageDraw from PIL import ImageDraw
import json import json
from optparse import OptionParser from optparse import OptionParser
import ox import ox

View file

@ -54,9 +54,8 @@ apt-get install -y \
python-setuptools \ python-setuptools \
python-pip \ python-pip \
python-virtualenv \ python-virtualenv \
python-imaging \
python-dev \ python-dev \
python-imaging \ python-pil \
python-numpy \ python-numpy \
python-psycopg2 \ python-psycopg2 \
python-pyinotify \ python-pyinotify \