Merge pull request #381 from fredgan/remove_useless_code

Remove useless imports and code
ncclient · Apr 6, 2020 · aedd2b3 · aedd2b3
2 parents d68ee21 + 0a4b4a7
commit aedd2b3
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 14 deletions.
diff --git a/ncclient/capabilities.py b/ncclient/capabilities.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import logging
-import sys
 import six
 
 

diff --git a/ncclient/devices/h3c.py b/ncclient/devices/h3c.py
@@ -12,8 +12,6 @@
 
 """
 
-from ncclient.xml_ import BASE_NS_1_0
-
 from .default import DefaultDeviceHandler
 from ncclient.operations.third_party.h3c.rpc import *
 

diff --git a/ncclient/manager.py b/ncclient/manager.py
@@ -18,10 +18,8 @@
 It exposes all core functionality.
 """
 
-from ncclient import capabilities
 from ncclient import operations
 from ncclient import transport
-import six
 import logging
 import functools
 

diff --git a/ncclient/operations/edit.py b/ncclient/operations/edit.py
@@ -57,15 +57,11 @@ def request(self, config, format='xml', target='candidate', default_operation=No
             if error_option == "rollback-on-error":
                 self._assert(":rollback-on-error")
             sub_ele(node, "error-option").text = error_option
-# <<<<<<< HEAD
-#         node.append(validated_element(config, ("config", qualify("config"))))
-# =======
         if format == 'xml':
             node.append(validated_element(config, ("config", qualify("config"))))
         if format == 'text':
             config_text = sub_ele(node, "config-text")
             sub_ele(config_text, "configuration-text").text = config
-# >>>>>>> juniper
         return self._request(node)
 
 

diff --git a/ncclient/operations/rpc.py b/ncclient/operations/rpc.py
@@ -14,7 +14,6 @@
 
 from threading import Event, Lock
 from uuid import uuid4
-import six
 
 from ncclient.xml_ import *
 from ncclient.logging_ import SessionLoggerAdapter

diff --git a/ncclient/transport/session.py b/ncclient/transport/session.py
@@ -14,8 +14,6 @@
 # limitations under the License.
 
 
-import re
-import sys
 import logging
 from threading import Thread, Lock, Event
 try:

diff --git a/ncclient/transport/third_party/junos/ioproc.py b/ncclient/transport/third_party/junos/ioproc.py
@@ -1,4 +1,3 @@
-import os
 import sys
 import re
 import six
@@ -7,7 +6,6 @@
     from cStringIO import StringIO
 else:
     from io import BytesIO as StringIO
-from select import select
 if sys.version>='2.7':
     from subprocess import Popen, check_output, PIPE, STDOUT
 else: