Bugs web sprint2 2

[will-moore]

This was previously #447 but rebased to fix merge conflicts.

[joshmoore]

NB: I wonder if we almost need to add methods to import these which does things in the right order. Something like:

Image = ImportPILImage() ImageDraw = ImportImageDraw()

I tried to keep these synchronized with the idiom:

@connection-rebase ~/git/components/tools/OmeroPy $ git grep -B 2 -A 2 ticket:2597 src/flim-omero.py- src/flim-omero.py-try: src/flim-omero.py: from PIL import Image, ImageDraw # see ticket:2597 src/flim-omero.py-except ImportError: src/flim-omero.py: import Image, ImageDraw # see ticket:2597

so that the following query should return nothing:

@connection-rebase ~/git/components/tools/OmeroPy $ git grep "import Image" | grep -v ticket:2597 | grep -vE "(ImageI|ImageAnnotationLinkI|ImageWrapper)" src/omero/gateway/__init__.py: import Image, ImageDraw, ImageFont src/omero/gateway/__init__.py: from PIL import Image, ImageDraw, ImageFont src/omero/util/populate_metadata.py:from omero.grid import ImageColumn, LongColumn, PlateColumn, StringColumn, \ src/omero/util/populate_roi.py:from omero.grid import ImageColumn, WellColumn, RoiColumn, LongColumn, DoubleColumn src/omero/util/script_utils.py: from PIL import Image src/omero/util/script_utils.py: import Image src/omero/util/uploadMask.py:from OmeroPopo import ImageData test/integration/bigImages.py: from PIL import Image

but likely these other locations were modified after my ticket:2597 changes. (Here I'm grepping in a different branch)

[manics]

#9586 is still a problem (open script, change datatype, ID's aren't cleared).

[will-moore]

Hmmm - I can see the logic behind ImportPILImage() etc, but then you've still got to import ImportPILImage from somewhere, which is kinda ugly. And then there's still no guarantee that anyone is going to use it (and not do their own PIL import).

[joshmoore]

@will-moore, it's a fair point, which is also, I guess, why I didn't go with anything like that. Perhaps just a pylint-style check to make sure all imports are done in the proper style would be good. And barring that, teach the team what to look for, so everyone reviews the PRs.

[will-moore]

Previous commit fixes Shape previews for shapes with no Z / T specified and Polygons with only a single point.

[joshmoore]

Is it worth including the comment with the ticket number so that the grep command I listed will return nothing?

[will-moore]

OK, but #2597 makes no mention of the need to try import 'from PIL' first. So that ticket will need to be updated with the info (and link) to #9790.

[bpindelski]

Merges fine with dev_4_4 locally (for testing if bin/omero web start succeeds).
70a7ddf looks ok but doesn't display the build number (only "OMERO.web .").

git grep "import Image" | grep -v ticket:2597 | grep -vE "(ImageI|ImageAnnotationLinkI|ImageWrapper|ImageColumn|ImageData)" returns nothing.

After correcting the lacking build number in the /webstart landing page, it's ready to merge.