fix pre

saltstack · Sep 30, 2020 · b234fda · b234fda
1 parent 92e09bf
commit b234fda
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/salt/cli/caller.py b/salt/cli/caller.py
@@ -37,8 +37,6 @@
 # Import 3rd-party libs
 from salt.log import LOG_LEVELS
 
-x = "fix pre"
-
 log = logging.getLogger(__name__)
 
 

diff --git a/salt/scripts.py b/salt/scripts.py
@@ -429,9 +429,6 @@ def salt_cp():
     client.run()
 
 
-x = "fix pre"
-
-
 def salt_call():
     """
     Directly call a salt command in the modules, does not require a running

diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
@@ -51,7 +51,6 @@
     zmq,
 )
 
-x = "fix pre"
 try:
     import zmq.utils.monitor
 

diff --git a/scripts/salt-call b/scripts/salt-call
@@ -6,6 +6,5 @@ minion to run.
 
 from salt.scripts import salt_call
 
-x = "fix pre"
 if __name__ == "__main__":
     salt_call()
diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py
@@ -35,6 +35,8 @@
     run_loop_in_thread,
 )
 
+x = "fix pre"
+
 # support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
 if not hasattr(zmq.eventloop.ioloop, "ZMQIOLoop"):
     zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,6 @@ @@
         zmq,
     )
-    x = "fix pre"
     try:
         import zmq.utils.monitor
@@ Expand Down @@