Commit165bf4c

committed

Revert "Merge pull request#177 from msabramo/require_ordereddict_for_py26"

This reverts commit3b3c103, reversingchanges made to7cce65b.Revert this till#179 is sorted.

1 parenta5efb0e commit165bf4cCopy full SHA for 165bf4c

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 11 deletions

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

Comments

(0)