summaryrefslogtreecommitdiff
path: root/paramiko/util.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-10 12:58:02 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-10 12:58:02 -0700
commitbade24d2d5b76c3f38bf0310ea8072184ab95b2a (patch)
tree160c9e52fc9911696247c1fe9e4bfec3c15ab662 /paramiko/util.py
parent0063e64046c732e8c50fc5f54234942feaa313d9 (diff)
parente71f4e59878a636268475f642ed4e98a1b3e375d (diff)
downloadparamiko-bade24d2d5b76c3f38bf0310ea8072184ab95b2a.tar.gz
Merge branch 'master' into 216-int
Conflicts: paramiko/transport.py paramiko/util.py tests/test_client.py
Diffstat (limited to 'paramiko/util.py')
-rw-r--r--paramiko/util.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/paramiko/util.py b/paramiko/util.py
index ee1a3abb..88ca2bc4 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -328,3 +328,7 @@ class ClosingContextManager(object):
def __exit__(self, type, value, traceback):
self.close()
+
+
+def clamp_value(minimum, val, maximum):
+ return max(minimum, min(val, maximum))