Invert setup.py uuid logic.

This commit is contained in:
Georg Brandl 2010-08-21 22:14:57 +02:00
parent 896be9a201
commit 867b421178

View File

@ -44,7 +44,7 @@ A development egg can be found `here
<http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_. <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
''' '''
requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5', 'uuid>=1.30'] requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5']
if sys.version_info < (2, 4): if sys.version_info < (2, 4):
print('ERROR: Sphinx requires at least Python 2.4 to run.') print('ERROR: Sphinx requires at least Python 2.4 to run.')
@ -61,10 +61,10 @@ if sys.version_info < (2, 5):
except: except:
pass pass
else: else:
del requires[-2] del requires[-1]
elif sys.version_info >= (2, 5):
# An uuid module has been added to the stdlib in 2.5 # The uuid module is new in the stdlib in 2.5
del requires[-1] requires.append('uuid>=1.30')
# Provide a "compile_catalog" command that also creates the translated # Provide a "compile_catalog" command that also creates the translated