Changeset 5702


Ignore:
Timestamp:
09/09/09 14:56:32 (12 years ago)
Author:
pnorton
Message:

Fixed the PIL imports, the code should now try to import Image from PIL before trying to import Image directly.

Location:
cowsclient/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • cowsclient/trunk

    • Property svn:ignore

      •  

        old new  
        22.pydevproject 
        33cowsclient.egg-info 
         4pnorton_development.ini 
         5.settings 
         6build 
         7dist 

  • cowsclient/trunk/buildout/buildout.cfg

    r5664 r5702  
    2020  matplotlib 
    2121  owslib 
     22  PIL 

  • cowsclient/trunk/cowsclient/controllers/wmsviz.py

    r5698 r5702  
    2424from cStringIO import StringIO 
    2525 
    26 try: 
    27     from PIL import Image, ImageChops 
    28 except: 
    29     import Image, ImageChops 
    3026     
    3127import logging 

  • cowsclient/trunk/cowsclient/lib/build_figure.py

    r5627 r5702  
    22from cowsclient.lib.wmc_util import openURL 
    33import urllib, urllib2, time 
    4 import copy, logging, Image, ImageChops 
     4import copy, logging 
     5 
     6try: 
     7    from PIL import Image, ImageChops 
     8except: 
     9    import Image, ImageChops 
     10     
    511from cowsclient.lib.base import request 
    612from cowsclient.lib.png_combine import merge 

  • cowsclient/trunk/cowsclient/lib/png_combine.py

    r5626 r5702  
    1 import Image 
     1 
     2try: 
     3    from PIL import Image 
     4except: 
     5    import Image 
     6 
    27import time 
    38import logging 

  • cowsclient/trunk/setup.cfg

    r5409 r5702  
    11[egg_info] 
    2 tag_build = dev 
    3 tag_svn_revision = false 
    4  
    5 [easy_install] 
    6 find_links = http://www.pylonshq.com/download/ 
    7  
    8 [pudge] 
    9 theme = pythonpaste.org 
    10  
    11 # Add extra doc files here with spaces between them 
    12 docs = docs/index.txt 
    13  
    14 # Doc Settings 
    15 doc_base = docs/ 
    16 dest = docs/html 
    17  
    18 # Add extra modules here separated with commas 
    19 modules = cowsclient 
    20 title = Cowsclient 
    21 organization = Pylons 
    22  
    23 # Highlight code-block sections with Pygments 
    24 highlighter = pygments 
    25  
    26 # Optionally add extra links 
    27 #organization_url = http://pylonshq.com/ 
    28 #trac_url = http://pylonshq.com/project 
    29 settings = no_about=true 
    30  
    31 # Optionally add extra settings 
    32 #           link1=/community/ Community 
    33 #           link2=/download/ Download 
    34  
    35 [publish] 
    36 doc-dir=docs/html 
    37 make-dirs=1 
    38  
    39 # Babel configuration 
    40 [compile_catalog] 
    41 domain = cowsclient 
    42 directory = cowsclient/i18n 
    43 statistics = true 
    44  
    45 [extract_messages] 
    46 add_comments = TRANSLATORS: 
    47 output_file = cowsclient/i18n/cowsclient.pot 
    48 width = 80 
    49  
    50 [init_catalog] 
    51 domain = cowsclient 
    52 input_file = cowsclient/i18n/cowsclient.pot 
    53 output_dir = cowsclient/i18n 
    54  
    55 [update_catalog] 
    56 domain = cowsclient 
    57 input_file = cowsclient/i18n/cowsclient.pot 
    58 output_dir = cowsclient/i18n 
    59 previous = true 
     2tag_svn_revision = true 
Note: See TracChangeset for help on using the changeset viewer.