Skip to content

Instantly share code, notes, and snippets.

@matsuu
Created December 15, 2011 00:08
Show Gist options
  • Save matsuu/1479209 to your computer and use it in GitHub Desktop.
Save matsuu/1479209 to your computer and use it in GitHub Desktop.
diff -Naur blockdiag-1.1.1.orig/setup.py blockdiag-1.1.1/setup.py
--- blockdiag-1.1.1.orig/setup.py 2011-11-26 14:03:32.000000000 +0900
+++ blockdiag-1.1.1/setup.py 2011-12-16 00:39:48.698644627 +0900
@@ -31,10 +31,12 @@
requires = ['setuptools',
'funcparserlib',
- 'OrderedDict',
'webcolors']
deplinks = []
+if sys.version_info > (2, 6) and sys.version_info < (2, 7):
+ requires.append('OrderedDict')
+
# Find imaging libraries
if is_installed('PIL'):
requires.append('PIL')
diff -Naur blockdiag-1.1.1.orig/src/blockdiag/utils/fontmap.py blockdiag-1.1.1/src/blockdiag/utils/fontmap.py
--- blockdiag-1.1.1.orig/src/blockdiag/utils/fontmap.py 2011-11-20 01:33:54.000000000 +0900
+++ blockdiag-1.1.1/src/blockdiag/utils/fontmap.py 2011-12-16 00:42:48.191739233 +0900
@@ -18,7 +18,8 @@
import sys
import copy
import codecs
-from ordereddict import OrderedDict
+if sys.version_info > (2, 6) and sys.version_info < (2, 7):
+ from ordereddict import OrderedDict
from ConfigParser import SafeConfigParser
from blockdiag.utils.collections import namedtuple
@@ -93,7 +94,7 @@
self.set_default_font(None)
def _parse_config(self, conffile):
- if sys.version_info > (2, 6):
+ if sys.version_info > (2, 6) and sys.version_info < (2, 7):
config = SafeConfigParser(dict_type=OrderedDict)
else:
config = SafeConfigParser()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment