Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #6654 -- Slightly refactored the way 'startproject' and 'starta…

…pp' check for existing Python modules. Thanks, i_i

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a0a06d1a89465e7800686eec905e4c6f16911684 1 parent cc64abf
@adrianholovaty adrianholovaty authored
View
13 django/core/management/commands/startapp.py
@@ -3,8 +3,7 @@
from django.core.management.base import copy_helper, CommandError, LabelCommand
class Command(LabelCommand):
- help = ("Creates a Django app directory structure for the given app name"
- " in the current directory.")
+ help = "Creates a Django app directory structure for the given app name in the current directory."
args = "[appname]"
label = 'application name'
@@ -16,6 +15,7 @@ class Command(LabelCommand):
def handle_label(self, app_name, directory=None, **options):
if directory is None:
directory = os.getcwd()
+
# Determine the project_name by using the basename of directory,
# which should be the full path of the project directory (or the
# current directory if no directory was passed).
@@ -23,6 +23,15 @@ def handle_label(self, app_name, directory=None, **options):
if app_name == project_name:
raise CommandError("You cannot create an app with the same name"
" (%r) as your project." % app_name)
+
+ # Check that the app_name cannot be imported.
+ try:
+ __import__(app_name)
+ except ImportError:
+ pass
+ else:
+ raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as an app name. Please try another name." % app_name)
+
copy_helper(self.style, 'app', app_name, directory, project_name)
class ProjectCommand(Command):
View
12 django/core/management/commands/startproject.py
@@ -3,8 +3,6 @@
import re
from random import choice
-INVALID_PROJECT_NAMES = ('django', 'site', 'test')
-
class Command(LabelCommand):
help = "Creates a Django project directory structure for the given project name in the current directory."
args = "[projectname]"
@@ -20,13 +18,13 @@ def handle_label(self, project_name, **options):
# the parent directory.
directory = os.getcwd()
+ # Check that the project_name cannot be imported.
try:
- proj_name = __import__(project_name)
- if proj_name:
- 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)
+ __import__(project_name)
except ImportError:
- if project_name in INVALID_PROJECT_NAMES:
- raise CommandError("%r contains an invalid project name. Please try another name." % project_name)
+ pass
+ else:
+ 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)
copy_helper(self.style, 'project', project_name, directory)

0 comments on commit a0a06d1

Please sign in to comment.
Something went wrong with that request. Please try again.