Django

Code

Ticket #6654: startproject-7320.patch

File startproject-7320.patch, 1.3 kB (added by i_i, 9 months ago)

Updated to latest revision

  • startproject.py

    old new  
    33import re 
    44from random import choice 
    55 
    6 INVALID_PROJECT_NAMES = ('django', 'site', 'test') 
    7  
    86class Command(LabelCommand): 
    97    help = "Creates a Django project directory structure for the given project name in the current directory." 
    108    args = "[projectname]" 
    …… 
    2018        # the parent directory. 
    2119        directory = os.getcwd() 
    2220 
     21        # Check that the project_name is free and can't be imported 
    2322        try: 
    24             proj_name = __import__(project_name) 
    25             if proj_name: 
    26                 raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name." % project_name) 
     23            __import__(project_name) 
    2724        except ImportError: 
    28             if project_name in INVALID_PROJECT_NAMES: 
    29                 raise CommandError("%r contains an invalid project name. Please try another name." % project_name) 
     25            pass 
     26        else: 
     27            raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name." % project_name) 
    3028 
    3129        copy_helper(self.style, 'project', project_name, directory) 
    3230