Merging upstream version 2.1.1 (Closes: #1026291).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/version.py b/version.py
index ff8f684..2609860 100755
--- a/version.py
+++ b/version.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Authors: Douglas Creager <dcreager@dcreager.net>
 #          Calum Lind <calumlind@gmail.com>
 #
@@ -31,8 +30,6 @@
 #   include RELEASE-VERSION
 #
 
-from __future__ import print_function, unicode_literals
-
 import os
 import subprocess
 
@@ -58,9 +55,9 @@ def call_git_describe(prefix='', suffix=''):
 
 def get_version(prefix='deluge-', suffix='.dev0'):
     try:
-        with open(VERSION_FILE, 'r') as f:
+        with open(VERSION_FILE) as f:
             release_version = f.readline().strip()
-    except IOError:
+    except OSError:
         release_version = None
 
     version = call_git_describe(prefix, suffix)