Django

Code

Changeset 4114

Show
Ignore:
Timestamp:
11/26/06 19:12:55 (2 years ago)
Author:
adrian
Message:

Fixed #2989 -- easy_install now works with Django's setup.py. Thanks for reporting, doc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/setup.py

    r3906 r4114  
    1212# an easy way to do this. 
    1313packages, data_files = [], [] 
    14 root_dir = os.path.join(os.path.dirname(__file__), 'django') 
    15 for dirpath, dirnames, filenames in os.walk(root_dir): 
     14root_dir = os.path.dirname(__file__) 
     15len_root_dir = len(root_dir) 
     16django_dir = os.path.join(root_dir, 'django') 
     17 
     18for dirpath, dirnames, filenames in os.walk(django_dir): 
    1619    # Ignore dirnames that start with '.' 
    1720    for i, dirname in enumerate(dirnames): 
    1821        if dirname.startswith('.'): del dirnames[i] 
    1922    if '__init__.py' in filenames: 
    20         packages.append(dirpath.replace('/', '.')) 
     23        package = dirpath[len_root_dir:].lstrip('/').replace('/', '.') 
     24        packages.append(package) 
    2125    else: 
    2226        data_files.append((dirpath, [os.path.join(dirpath, f) for f in filenames]))