update candv dependency & tidy up

README.rst

@@ -1,7 +1,7 @@
 IL-2 FB Difficulty
 ==================
 
-|Build Status| |Coverage Status| |PyPi package| |PyPi downloads|
+|Build Status| |Coverage Status| |PyPi package| |PyPi downloads| |License|
 
 Parser and emitter of difficulty settings for ``IL-2 Forgotten Battles``.
 
@@ -14,3 +14,5 @@ Parser and emitter of difficulty settings for ``IL-2 Forgotten Battles``.
    :target: http://badge.fury.io/py/il2fb-difficulty/
 .. |PyPi downloads| image::  http://img.shields.io/pypi/dm/il2fb-difficulty.svg?style=flat
    :target: https://crate.io/packages/il2fb-difficulty/
+.. |License| image:: https://img.shields.io/badge/license-LGPLv3-brightgreen.svg?style=flat
+   :target: http://badge.fury.io/py/il2fb-difficulty/

il2fb/difficulty/__init__.py

@@ -2,6 +2,7 @@
 """
 Convert integer value of game difficulty into dictionary and vice versa.
 """
+
 from collections import OrderedDict
 from functools import reduce
 

il2fb/difficulty/constants.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 from candv import Constants, Values, VerboseConstant, VerboseValueConstant
 
 from .utils import translations

il2fb/difficulty/settings/__init__.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+
 from candv import ValueConstant
 from il2fb.commons import GameVersions
 from six import string_types
 
 from il2fb.difficulty.utils import translations, flatten_settings
+
 from .v4_12 import SETTINGS as SETTINGS_4_12
 
 
@@ -31,7 +33,7 @@ def _on_invalid_version():
                          .format(', '.join(supported_versions)))
 
     if isinstance(value, ValueConstant):
-        if GameVersions.contains(value.name):
+        if value.name in GameVersions:
             version = value
         else:
             _on_invalid_version()

il2fb/difficulty/settings/v4_12.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 from collections import OrderedDict
 
 from il2fb.difficulty.constants import PARAMETERS, TABS

il2fb/difficulty/utils.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
+
 import os
 
 from verboselib.factory import TranslationsFactory
 
 
-_here = os.path.abspath(os.path.dirname(__file__))
+__here__ = os.path.abspath(os.path.dirname(__file__))
 
-translations = TranslationsFactory("il2fb-difficulty",
-                                   os.path.join(_here, "locale"))
+locale_dir = os.path.join(__here__, "locale")
+translations = TranslationsFactory("il2fb-difficulty", locale_dir)
 
 
 def inverse_dict(source):

il2fb/difficulty/validators.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+
 from six import integer_types
 
 from .utils import translations
 
+
 _ = translations.ugettext
 
 

requirements.txt

@@ -4,8 +4,8 @@
 #
 #     pip install -r requirements.txt
 
-candv>=1.1.0
-il2fb-commons>=0.9.2
+candv>=1.2.0
+il2fb-commons>=0.9.6
 six>=1.6.1
 stringlike>=0.3.3
 verboselib>=0.1.0

setup.py

@@ -1,17 +1,21 @@
 # -*- coding: utf-8 -*-
+
 import os
 
 from setuptools import setup
 
 
-here = os.path.abspath(os.path.dirname(__file__))
+__here__ = os.path.abspath(os.path.dirname(__file__))
 
-README = open(os.path.join(here, 'README.rst')).read()
-REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
+README = open(os.path.join(__here__, 'README.rst')).read()
+REQUIREMENTS = [
+    i.strip()
+    for i in open(os.path.join(__here__, 'requirements.txt')).readlines()
+]
 
 setup(
     name='il2fb-difficulty',
-    version='1.1.0',
+    version='1.1.1',
     description="Parser and emitter of difficulty settings for IL-2 FB",
     long_description=README,
     license='LGPLv3',