Commit 0e11fdb2 authored by Paul Brown's avatar Paul Brown

fix OrderedDict implementation for python 2.6

parent 7349a0af
......@@ -87,17 +87,4 @@ def with_metaclass(meta, *bases):
try:
from collections import OrderedDict
except ImportError:
# Bare-bones OrderedDict implementation for Python2.6 compatibility
class OrderedDict(dict):
def __init__(self, *args, **kwargs):
dict.__init__(self, *args, **kwargs)
self.ordered_keys = []
def __setitem__(self, key, value):
self.ordered_keys.append(key)
dict.__setitem__(self, key, value)
def __iter__(self):
return (k for k in self.ordered_keys)
def iteritems(self):
return ((k, self[k]) for k in self.ordered_keys)
def items(self):
return list(self.iteritems())
from ordereddict import OrderedDict
# Fix for older setuptools
import re
import os
import sys
from setuptools import setup, find_packages
......@@ -30,6 +31,14 @@ def grep(attrname):
return strval
install_requires = [
'Flask>=0.7',
'wtforms'
]
if sys.version_info[:2] < (2, 7):
install_requires.append('ordereddict')
setup(
name='Flask-Admin',
version=grep('__version__'),
......@@ -43,10 +52,7 @@ setup(
include_package_data=True,
zip_safe=False,
platforms='any',
install_requires=[
'Flask>=0.7',
'wtforms'
],
install_requires=install_requires,
tests_require=[
'nose>=1.0',
'pillow==2.9.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment