Navigation

setup.py

Timestamp:

03/13/08 01:14:26 (10 months ago)

Author:

jkocherhans

Message:

newforms-admin: Merged from trunk up to [7232]

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7120 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7232

r5918	r7233
28	28	packages, data_files = [], []
29	29	root_dir = os.path.dirname(__file__)
30		django_dir = os.path.join(root_dir, 'django')
31		pieces = fullsplit(root_dir)
32		if pieces[-1] == '':
33		len_root_dir = len(pieces) - 1
34		else:
35		len_root_dir = len(pieces)
	30	if root_dir != '':
	31	os.chdir(root_dir)
	32	django_dir = 'django'
36	33
37	34	for dirpath, dirnames, filenames in os.walk(django_dir):
…	…
40	37	if dirname.startswith('.'): del dirnames[i]
41	38	if '__init__.py' in filenames:
42		packages.append('.'.join(fullsplit(dirpath)~~[len_root_dir:]~~))
	39	packages.append('.'.join(fullsplit(dirpath)))
43	40	elif filenames:
44	41	data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])