Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.

1 files changed, 34 insertions, 34 deletions

diff --git a/contrib/python/Pygments/py3/pygments/formatters/__init__.py b/contrib/python/Pygments/py3/pygments/formatters/__init__.py
index 66c9e9d404..3e4766d163 100644
--- a/contrib/python/Pygments/py3/pygments/formatters/__init__.py
+++ b/contrib/python/Pygments/py3/pygments/formatters/__init__.py
@@ -19,7 +19,7 @@ from pygments.plugin import find_plugin_formatters
 from pygments.util import ClassNotFound
 
 __all__ = ['get_formatter_by_name', 'get_formatter_for_filename',
-           'get_all_formatters', 'load_formatter_from_file'] + list(FORMATTERS)
+           'get_all_formatters', 'load_formatter_from_file'] + list(FORMATTERS) 
 
 _formatter_cache = {}  # classes by name
 _pattern_cache = {}
@@ -78,42 +78,42 @@ def get_formatter_by_name(_alias, **options):
     return cls(**options)
 
 
-def load_formatter_from_file(filename, formattername="CustomFormatter",
-                             **options):
-    """Load a formatter from a file.
-
-    This method expects a file located relative to the current working
-    directory, which contains a class named CustomFormatter. By default,
-    it expects the Formatter to be named CustomFormatter; you can specify
-    your own class name as the second argument to this function.
-
-    Users should be very careful with the input, because this method
-    is equivalent to running eval on the input file.
-
-    Raises ClassNotFound if there are any problems importing the Formatter.
-
-    .. versionadded:: 2.2
-    """
-    try:
-        # This empty dict will contain the namespace for the exec'd file
-        custom_namespace = {}
-        with open(filename, 'rb') as f:
-            exec(f.read(), custom_namespace)
-        # Retrieve the class `formattername` from that namespace
-        if formattername not in custom_namespace:
-            raise ClassNotFound('no valid %s class found in %s' %
-                                (formattername, filename))
-        formatter_class = custom_namespace[formattername]
-        # And finally instantiate it with the options
-        return formatter_class(**options)
+def load_formatter_from_file(filename, formattername="CustomFormatter", 
+                             **options): 
+    """Load a formatter from a file. 
+ 
+    This method expects a file located relative to the current working 
+    directory, which contains a class named CustomFormatter. By default, 
+    it expects the Formatter to be named CustomFormatter; you can specify 
+    your own class name as the second argument to this function. 
+ 
+    Users should be very careful with the input, because this method 
+    is equivalent to running eval on the input file. 
+ 
+    Raises ClassNotFound if there are any problems importing the Formatter. 
+ 
+    .. versionadded:: 2.2 
+    """ 
+    try: 
+        # This empty dict will contain the namespace for the exec'd file 
+        custom_namespace = {} 
+        with open(filename, 'rb') as f: 
+            exec(f.read(), custom_namespace) 
+        # Retrieve the class `formattername` from that namespace 
+        if formattername not in custom_namespace: 
+            raise ClassNotFound('no valid %s class found in %s' % 
+                                (formattername, filename)) 
+        formatter_class = custom_namespace[formattername] 
+        # And finally instantiate it with the options 
+        return formatter_class(**options) 
     except OSError as err:
         raise ClassNotFound('cannot read %s: %s' % (filename, err))
     except ClassNotFound:
-        raise
-    except Exception as err:
-        raise ClassNotFound('error when loading custom formatter: %s' % err)
-
-
+        raise 
+    except Exception as err: 
+        raise ClassNotFound('error when loading custom formatter: %s' % err) 
+ 
+ 
 def get_formatter_for_filename(fn, **options):
     """Lookup and instantiate a formatter by filename pattern.