From d9c54cd83e8c676e34497fa135786a626d5d1fc7 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 13 Aug 2009 09:27:13 -0400
Subject: Clean up additional issues discovered with pylint and pychecker

---
 ipapython/ipasslfile.py        |  4 +++-
 ipapython/ipautil.py           | 10 ----------
 ipapython/test/test_ipautil.py |  8 ++++----
 3 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'ipapython')

diff --git a/ipapython/ipasslfile.py b/ipapython/ipasslfile.py
index 5f4ea2a7b..2082e2683 100644
--- a/ipapython/ipasslfile.py
+++ b/ipapython/ipasslfile.py
@@ -17,7 +17,9 @@
 
 import socket
 import errno
-from httplib import UnimplementedFileMode
+from httplib import UnimplementedFileMode, HTTPException
+
+error = HTTPException
 
 class SharedSocket:
     def __init__(self, sock):
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 2fa26fef8..240e0d872 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -600,16 +600,6 @@ def user_input_plain(prompt, default = None, allow_empty = True, allow_spaces =
         if ipavalidate.Plain(ret, not allow_empty, allow_spaces):
             return ret
 
-def user_input_path(prompt, default = None, allow_empty = True):
-    if default != None and allow_empty:
-        prompt += " (enter \"none\" for empty)"
-    while True:
-        ret = user_input(prompt, default, allow_empty)
-        if allow_empty and ret.lower() == "none":
-            return ""
-        if ipavalidate.Path(ret, not allow_empty):
-            return ret
-
 class AttributeValueCompleter:
     '''
     Gets input from the user in the form "lhs operator rhs"
diff --git a/ipapython/test/test_ipautil.py b/ipapython/test/test_ipautil.py
index 7df8e99a9..98e8846c3 100644
--- a/ipapython/test/test_ipautil.py
+++ b/ipapython/test/test_ipautil.py
@@ -275,7 +275,7 @@ class TestTimeParser(unittest.TestCase):
         time = ipautil.parse_generalized_time(timestr)
         self.assertEqual(0, time.tzinfo.houroffset)
         self.assertEqual(0, time.tzinfo.minoffset)
-        offset = time.tzinfo.utcoffset(None)
+        offset = time.tzinfo.utcoffset()
         self.assertEqual(0, offset.seconds)
 
         timestr = "20051213141205+0500"
@@ -283,7 +283,7 @@ class TestTimeParser(unittest.TestCase):
         time = ipautil.parse_generalized_time(timestr)
         self.assertEqual(5, time.tzinfo.houroffset)
         self.assertEqual(0, time.tzinfo.minoffset)
-        offset = time.tzinfo.utcoffset(None)
+        offset = time.tzinfo.utcoffset()
         self.assertEqual(5 * 60 * 60, offset.seconds)
 
         timestr = "20051213141205-0500"
@@ -293,7 +293,7 @@ class TestTimeParser(unittest.TestCase):
         self.assertEqual(0, time.tzinfo.minoffset)
         # NOTE - the offset is always positive - it's minutes
         #        _east_ of UTC
-        offset = time.tzinfo.utcoffset(None)
+        offset = time.tzinfo.utcoffset()
         self.assertEqual((24 - 5) * 60 * 60, offset.seconds)
 
         timestr = "20051213141205-0930"
@@ -301,7 +301,7 @@ class TestTimeParser(unittest.TestCase):
         time = ipautil.parse_generalized_time(timestr)
         self.assertEqual(-9, time.tzinfo.houroffset)
         self.assertEqual(-30, time.tzinfo.minoffset)
-        offset = time.tzinfo.utcoffset(None)
+        offset = time.tzinfo.utcoffset()
         self.assertEqual(((24 - 9) * 60 * 60) - (30 * 60), offset.seconds)
 
 
-- 
cgit