From a10a4b0af4ed2bf39dbc2664e3a89cff3f72fc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20Ram=C3=ADrez?= Date: Sun, 20 Jul 2014 17:00:34 -0600 Subject: [PATCH] Revert "Fix import error in pyhton 2.6." This reverts commit f6a78cb4b2409ffbc3226d3c58e850629fdd5045. --- secretary.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/secretary.py b/secretary.py index 4cfb34a..43635fc 100644 --- a/secretary.py +++ b/secretary.py @@ -22,15 +22,10 @@ import re import sys import logging import zipfile +from collections import OrderedDict from xml.dom.minidom import parseString from jinja2 import Environment, Undefined -try: - from collections import OrderedDict -except ImportError: - # Its python 2.6 - pass - # Test python versions and normalize calls to basestring, unicode, etc. try: unicode = unicode @@ -308,7 +303,7 @@ class Renderer(object): def _encode_escape_chars(self, xml_text): if sys.version_info >= (2, 7): encode_rules = OrderedDict() - + encode_rules = { '(?i)(.*)(\n)(.*)': r'\1\3', '(?i)(.*)(\u0009)(.*)': r'\1\3',