Merge tag '0.3.1' into develop

0.3.1
marcoimme · Jul 4, 2017 · 6607ad9 · 6607ad9
2 parents 2765cbc + 4ffd04e
commit 6607ad9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+Release 0.3.1
+-------------
+
+* use int value for timeout
+
+
 Release 0.3
 -----------
 

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Following SETTINGS are available:
     PAGE_EXPORTER_CAPTURE_SCRIPT = './capture.js'
 	PAGE_EXPORTER_PHANTOMJS_CMD = '~/bin/phantomjs'
 	PAGE_EXPORTER_WAIT = '2000'
-	PAGE_EXPORTER_TIMEOUT = '60000'
+	PAGE_EXPORTER_TIMEOUT_SECONDS = 60
 
 See [docs](https://django-page-exporter.readthedocs.org/en/latest/) for further information
 

diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -41,4 +41,4 @@ you can ovverride default configuration using:
     PAGE_EXPORTER_CLI_ARGS = []
     PAGE_EXPORTER_PHANTOMJS_CMD = None
     PAGE_EXPORTER_WAIT = '2000'
-    PAGE_EXPORTER_TIMEOUT = '60000'
+    PAGE_EXPORTER_TIMEOUT_SECONDS = 60
diff --git a/src/page_exporter/__init__.py b/src/page_exporter/__init__.py
@@ -3,7 +3,7 @@
 import os
 
 NAME = 'django_page_exporter'.replace('_', '-')
-VERSION = __version__ = (0, 3, 0, 'final', 0)
+VERSION = __version__ = (0, 3, 1, 'final', 0)
 __author__ = 'Marco Immediato'
 
 

diff --git a/src/page_exporter/config.py b/src/page_exporter/config.py
@@ -6,7 +6,7 @@
 PAGE_EXPORTER_CLI_ARGS = []
 PAGE_EXPORTER_PHANTOMJS_CMD = None
 PAGE_EXPORTER_WAIT = '2000'
-PAGE_EXPORTER_TIMEOUT = '60000'
+PAGE_EXPORTER_TIMEOUT_SECONDS = 60
 
 
 class Settings(object):

diff --git a/src/page_exporter/utils.py b/src/page_exporter/utils.py
@@ -101,7 +101,7 @@ def page_capture(stream, url, method=None, width=None, height=None,
         # Run PhantomJS process
         proc = subprocess.Popen(cmd, **phantomjs_command_kwargs())
 
-        my_timer = Timer(conf.TIMEOUT, kill, [proc])
+        my_timer = Timer(conf.TIMEOUT_SECONDS, kill, [proc])
 
         try:
             my_timer.start()