Fabian Peter Hammerle 8 年之前
父節點
當前提交
2d5bd15885
共有 2 個文件被更改,包括 14 次插入5 次删除
  1. 1 1
      LICENSE.txt
  2. 13 4
      ioex/__init__.py

+ 1 - 1
LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Fabian Peter Hammerle
+Copyright (c) 2015-2017 Fabian Peter Hammerle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

+ 13 - 4
ioex/__init__.py

@@ -9,11 +9,13 @@ try:
 except ImportError:
     yaml = None
 
+
 class UnsupportedLocaleSettingError(locale.Error):
     pass
 
 locale_lock = threading.Lock()
 
+
 @contextlib.contextmanager
 def setlocale(temporary_locale):
     with locale_lock:
@@ -29,6 +31,7 @@ def setlocale(temporary_locale):
         finally:
             locale.setlocale(locale.LC_ALL, primary_locale)
 
+
 def raw_input_with_default(prompt, default):
     def pre_input_hook():
         readline.insert_text(default)
@@ -39,6 +42,7 @@ def raw_input_with_default(prompt, default):
     finally:
         readline.set_pre_input_hook(None)
 
+
 def int_input_with_default(prompt, default):
     if default:
         default = str(default)
@@ -50,20 +54,23 @@ def int_input_with_default(prompt, default):
     else:
         return None
 
+
 def yaml_represent_unicode_as_str(dumper, unicode_string):
     return dumper.represent_scalar(u'tag:yaml.org,2002:str', unicode_string)
 
+
 def register_yaml_unicode_as_str_representer(dumper):
     try:
         dumper.add_representer(unicode, yaml_represent_unicode_as_str)
-    except NameError: # python3
+    except NameError:  # python3
         pass
 
+
 def yaml_construct_str_as_unicode(loader, node):
     string = loader.construct_scalar(node)
     try:
-        return string if type(string) is unicode else string.decode('utf-8')
-    except NameError: # python3
+        return string if isinstance(string, unicode) else string.decode('utf-8')
+    except NameError:  # python3
         return string
 
 
@@ -71,7 +78,7 @@ def register_yaml_str_as_unicode_constructor(loader):
     loader.add_constructor(
         u'tag:yaml.org,2002:str',
         yaml_construct_str_as_unicode,
-        )
+    )
 
 
 yaml_diff_colors = {
@@ -81,12 +88,14 @@ yaml_diff_colors = {
     '?': ioex.shell.TextColor.yellow,
 }
 
+
 def yaml_diff(a, b, dumper=None, colors=False):
     if dumper is None:
         class DiffDumper(yaml.Dumper):
             pass
         register_yaml_unicode_as_str_representer(DiffDumper)
         dumper = DiffDumper
+
     def to_yaml(data):
         return yaml.dump(
             data,