Merge branch 'fix_timeout_exceeded_message'

mytarget-test-team · Mar 10, 2016 · 3a77dee · 3a77dee
2 parents e34a9a5 + f1d5747
commit 3a77dee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/seismograph/__init__.py b/seismograph/__init__.py
@@ -35,7 +35,7 @@
 from .datastructures import Context
 
 
-__version__ = '0.2.3'
+__version__ = '0.2.4'
 
 
 __all__ = (

diff --git a/seismograph/ext/selenium/proxy.py b/seismograph/ext/selenium/proxy.py
@@ -242,14 +242,19 @@ def waiting_for(self,
                     delay=None,
                     args=None,
                     kwargs=None):
+        delay = delay or self.config.POLLING_DELAY
+        timeout = timeout or self.config.POLLING_TIMEOUT
+        exc_cls = exc_cls or polling.PollingTimeoutExceeded
+        message = message or 'Wait timeout "{}" has been exceeded'.format(timeout)
+
         return waiting_for(
             callback,
             args=args,
             kwargs=kwargs,
-            delay=delay or self.config.POLLING_DELAY,
-            timeout=timeout or self.config.POLLING_TIMEOUT,
-            exc_cls=exc_cls or polling.PollingTimeoutExceeded,
-            message=message or 'Wait timeout "{}" has been exceeded'.format(timeout),
+            delay=delay,
+            timeout=timeout,
+            exc_cls=exc_cls,
+            message=message,
         )
 
     @contextmanager

diff --git a/setup.py b/setup.py
@@ -110,7 +110,7 @@ def install_package():
         },
         test_suite='tests',
         classifiers=(
-            'Development Status :: 3 - Alpha',
+            'Development Status :: 4 - Beta',
             'Framework :: Seismograph',
             'Natural Language :: Russian',
             'Intended Audience :: Developers',