From 60f1fa4b722a79cf86c6a0940a9df218d57787b3 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Sun, 18 Nov 2012 11:06:42 -0800
Subject: remove the mispaelled duplicate file after syncronizing any changes

---
 layman/compatability.py | 45 ---------------------------------------------
 layman/compatibility.py | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 layman/compatability.py

diff --git a/layman/compatability.py b/layman/compatability.py
deleted file mode 100644
index ea7149e..0000000
--- a/layman/compatability.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-""" Copyright 2005 - 2008 Gunnar Wrobel
-              2011 - Brian Dolbec
- Distributed under the terms of the GNU General Public License v2
-"""
-
-import sys, types
-
-
-def encode(text, enc="UTF-8"):
-    """py2, py compatibility function"""
-    if hasattr(text, 'decode'):
-        return text.decode(enc)
-    return str(text)
-
-
-def fileopen(path, mode, enc="UTF-8"):
-    """py2, py3 compatibility function"""
-    try:
-        f = open(path, mode, encoding=enc)
-    except TypeError:
-        f = open(path, mode)
-    return f
-
-
-def cmp_to_key(mycmp):
-    'Convert a cmp= function into a key= function'
-    class K(object):
-        def __init__(self, obj, *args):
-            self.obj = obj
-        def __lt__(self, other):
-            return mycmp(self.obj, other.obj) < 0
-        def __gt__(self, other):
-            return mycmp(self.obj, other.obj) > 0
-        def __eq__(self, other):
-            return mycmp(self.obj, other.obj) == 0
-        def __le__(self, other):
-            return mycmp(self.obj, other.obj) <= 0
-        def __ge__(self, other):
-            return mycmp(self.obj, other.obj) >= 0
-        def __ne__(self, other):
-            return mycmp(self.obj, other.obj) != 0
-    return K
diff --git a/layman/compatibility.py b/layman/compatibility.py
index b71a8af..e6206db 100644
--- a/layman/compatibility.py
+++ b/layman/compatibility.py
@@ -6,8 +6,6 @@
  Distributed under the terms of the GNU General Public License v2
 """
 
-import sys, types
-
 
 def encode(text, enc="UTF-8"):
     """py2, py3 compatibility function"""
@@ -27,3 +25,22 @@ def fileopen(path, mode='r', enc="UTF-8"):
         f = open(path, mode)
     return f
 
+
+def cmp_to_key(mycmp):
+    'Convert a cmp= function into a key= function'
+    class K(object):
+        def __init__(self, obj, *args):
+            self.obj = obj
+        def __lt__(self, other):
+            return mycmp(self.obj, other.obj) < 0
+        def __gt__(self, other):
+            return mycmp(self.obj, other.obj) > 0
+        def __eq__(self, other):
+            return mycmp(self.obj, other.obj) == 0
+        def __le__(self, other):
+            return mycmp(self.obj, other.obj) <= 0
+        def __ge__(self, other):
+            return mycmp(self.obj, other.obj) >= 0
+        def __ne__(self, other):
+            return mycmp(self.obj, other.obj) != 0
+    return K
-- 
cgit v1.2.3-1-g7c22