1 --- Twisted-2.5.0/TwistedCore-2.5.0/setup.py 2006-12-22 23:02:47.000000000 -0600
2 +++ Twisted-2.5.0.new/TwistedCore-2.5.0/setup.py 2007-05-14 16:13:36.095282000 -0500
4 from distutils.core import Extension
6 if os.path.exists('twisted'):
7 - sys.path.insert(0, '.') # eek! need this to import twisted. sorry.
8 -from twisted import copyright
9 -from twisted.python import dist, util
10 + sys.path.insert(0, 'twisted/python') # eek! need this to import twisted. sorry.
13 def detectExtensions(builder):
19 - version=copyright.version,
21 description="An asynchronous networking framework written in Python",
22 author="Twisted Matrix Laboratories",
23 author_email="twisted-python@twistedmatrix.com",
24 --- Twisted-2.5.0/TwistedWords-0.5.0/setup.py 2006-05-13 14:26:09.000000000 -0500
25 +++ Twisted-2.5.0.new/TwistedWords-0.5.0/setup.py 2007-05-14 16:24:39.860764750 -0500
28 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
31 - from twisted.python import dist
34 raise SystemExit("twisted.python.dist module not found. Make sure you "
35 "have installed the Twisted core package before "
36 --- Twisted-2.5.0/TwistedCore-2.5.0/twisted/python/dist.py 2006-10-01 14:16:04.000000000 -0500
37 +++ Twisted-2.5.0.new//TwistedCore-2.5.0/twisted/python/dist.py 2007-05-14 16:50:07.952264500 -0500
42 - vfile = os.path.join(base, '_version.py')
44 + elif proj == 'words':
46 + elif proj == 'conch':
48 + elif proj == 'lore':
50 + elif proj == 'mail':
52 + elif proj == 'names':
54 + elif proj == 'news':
56 + elif proj == 'runner':
61 - vfile = os.path.join(base, proj, '_version.py')
62 - ns = {'__name__': 'Nothing to see here'}
64 - return ns['version'].base()
68 # Names that are exluded from globbing results:
69 --- Twisted-2.5.0/TwistedConch-0.8.0/setup.py 2006-05-13 14:26:09.000000000 -0500
70 +++ Twisted-2.5.0.new//TwistedConch-0.8.0/setup.py 2007-05-14 17:00:05.501609000 -0500
73 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
76 - from twisted.python import dist
79 raise SystemExit("twisted.python.dist module not found. Make sure you "
80 "have installed the Twisted core package before "
81 --- Twisted-2.5.0/TwistedLore-0.3.0/setup.py 2006-05-13 14:26:09.000000000 -0500
82 +++ Twisted-2.5.0.new/TwistedLore-0.3.0/setup.py 2007-05-14 17:17:25.374597000 -0500
85 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
88 - from twisted.python import dist
91 raise SystemExit("twisted.python.dist module not found. Make sure you "
92 "have installed the Twisted core package before "
93 --- Twisted-2.5.0/TwistedMail-0.4.0/setup.py 2006-05-13 14:26:09.000000000 -0500
94 +++ Twisted-2.5.0.new/TwistedMail-0.4.0/setup.py 2007-05-14 17:18:02.544920000 -0500
97 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
101 - from twisted.python import dist
105 raise SystemExit("twisted.python.dist module not found. Make sure you "
106 "have installed the Twisted core package before "
107 --- Twisted-2.5.0/TwistedNames-0.4.0/setup.py 2006-05-13 14:26:09.000000000 -0500
108 +++ Twisted-2.5.0.new/TwistedNames-0.4.0/setup.py 2007-05-14 17:18:37.707117500 -0500
111 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
115 - from twisted.python import dist
119 raise SystemExit("twisted.python.dist module not found. Make sure you "
120 "have installed the Twisted core package before "
121 --- Twisted-2.5.0/TwistedNews-0.3.0/setup.py 2006-05-13 14:26:09.000000000 -0500
122 +++ Twisted-2.5.0.new/TwistedNews-0.3.0/setup.py 2007-05-14 17:19:16.769558750 -0500
125 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
128 - from twisted.python import dist
132 raise SystemExit("twisted.python.dist module not found. Make sure you "
133 "have installed the Twisted core package before "
134 --- Twisted-2.5.0/TwistedRunner-0.2.0/setup.py 2006-05-13 14:26:09.000000000 -0500
135 +++ Twisted-2.5.0.new/TwistedRunner-0.2.0/setup.py 2007-05-14 17:20:54.367658250 -0500
138 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
140 from distutils.core import Extension
143 - from twisted.python import dist
147 raise SystemExit("twisted.python.dist module not found. Make sure you "
148 "have installed the Twisted core package before "
149 --- Twisted-2.5.0/TwistedWeb-0.7.0/setup.py 2006-05-13 14:26:09.000000000 -0500
150 +++ Twisted-2.5.0.new/TwistedWeb-0.7.0/setup.py 2007-05-14 17:21:21.065326750 -0500
153 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
157 - from twisted.python import dist
161 raise SystemExit("twisted.python.dist module not found. Make sure you "
162 "have installed the Twisted core package before "