Django

Code

Show
Ignore:
Timestamp:
06/04/08 12:37:02 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7545-7546,7548-7561,7563-7565,7567-7569 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7539 to /django/trunk:1-7572
  • django/branches/gis/django/template/loaders/eggs.py

    r6018 r7573  
    1919        for app in settings.INSTALLED_APPS: 
    2020            try: 
    21                 return (resource_string(app, pkg_name), 'egg:%s:%s ' % (app, pkg_name)).decode(settings.FILE_CHARSET
     21                return (resource_string(app, pkg_name).decode(settings.FILE_CHARSET), 'egg:%s:%s' % (app, pkg_name)
    2222            except: 
    2323                pass