Commite76c567

committed

setup.py: Require ordereddict for Python 2.6

1 parent7cce65b commite76c567Copy full SHA for e76c567

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-fromdistutils.coreimportsetup`
	`1`	`+try:`
	`2`	`+fromsetuptoolsimportsetup`
	`3`	`+exceptImportError:`
	`4`	`+fromdistutils.coreimportsetup`
`2`	`5`	`importos`
`3`	`6`	`importcodecs`
`4`	`7`
`@@ -23,6 +26,12 @@`
`23`	`26`	`ifos.path.isdir(os.path.join('html5lib',name))and`
`24`	`27`	`notname.startswith('.')andname!='tests']`
`25`	`28`
	`29`	`+install_requires= ['six']`
	`30`	`+try:`
	`31`	`+fromcollectionsimportOrderedDict`
	`32`	`+exceptImportError:`
	`33`	`+install_requires.append('ordereddict')`
	`34`	`+`
`26`	`35`	`current_dir=os.path.dirname(__file__)`
`27`	`36`	`withcodecs.open(os.path.join(current_dir,'README.rst'),'r','utf8')asreadme_file:`
`28`	`37`	`withcodecs.open(os.path.join(current_dir,'CHANGES.rst'),'r','utf8')aschanges_file:`
`@@ -38,7 +47,5 @@`
`38`	`47`	`maintainer='James Graham',`
`39`	`48`	`maintainer_email='james@hoppipolla.co.uk',`
`40`	`49`	`packages=packages,`
`41`		`-install_requires=[`
`42`		`-'six',`
`43`		`- ],`
	`50`	`+install_requires=install_requires,`
`44`	`51`	`)`

Comments

(0)