Restoring authorship annotation for <danila-eremin@yandex-team.ru>. Commit 2 of 2.

6 files changed, 52 insertions, 52 deletions

diff --git a/contrib/python/pytest/py2/_pytest/python.py b/contrib/python/pytest/py2/_pytest/python.py
index 4ceb01a7e4..f7c368b0c4 100644
--- a/contrib/python/pytest/py2/_pytest/python.py
+++ b/contrib/python/pytest/py2/_pytest/python.py
@@ -896,7 +896,7 @@ class CallSpec2(object):
 
     @property
     def id(self):
-        return "-".join(map(safe_str, self._idlist)) 
+        return "-".join(map(safe_str, self._idlist))
 
     def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index):
         for arg, val in zip(argnames, valset):
diff --git a/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch b/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch
index 5e8fcb70ae..8d0ae7a5fb 100644
--- a/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch
+++ b/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch
@@ -1,17 +1,17 @@
-commit 46b46cea857997531a7b9b4de32556be50bd5aea (HEAD -> pytest-backport-pr-6607) 
-author: danila-eremin 
-date: 2022-01-22T16:55:07+03:00 
+commit 46b46cea857997531a7b9b4de32556be50bd5aea (HEAD -> pytest-backport-pr-6607)
+author: danila-eremin
+date: 2022-01-22T16:55:07+03:00
+
+    backport py2
+
+--- contrib/python/pytest/py2/_pytest/python.py	(b87553999455f0084413c5b59139aa9ccb5e3f52)
++++ contrib/python/pytest/py2/_pytest/python.py	(46b46cea857997531a7b9b4de32556be50bd5aea)
+@@ -896,7 +896,7 @@ class CallSpec2(object):
  
-    backport py2 
+     @property
+     def id(self):
+-        return "-".join(map(safe_str, filter(None, self._idlist)))
++        return "-".join(map(safe_str, self._idlist))
  
---- contrib/python/pytest/py2/_pytest/python.py	(b87553999455f0084413c5b59139aa9ccb5e3f52) 
-+++ contrib/python/pytest/py2/_pytest/python.py	(46b46cea857997531a7b9b4de32556be50bd5aea) 
-@@ -896,7 +896,7 @@ class CallSpec2(object): 
-  
-     @property 
-     def id(self): 
--        return "-".join(map(safe_str, filter(None, self._idlist))) 
-+        return "-".join(map(safe_str, self._idlist)) 
-  
-     def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index): 
-         for arg, val in zip(argnames, valset): 
+     def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index):
+         for arg, val in zip(argnames, valset):
diff --git a/contrib/python/ya.make b/contrib/python/ya.make
index 2898a62f37..d01ced9f3a 100644
--- a/contrib/python/ya.make
+++ b/contrib/python/ya.make
@@ -755,7 +755,7 @@ RECURSE(
     portalocker
     portpicker
     ppdeep
-    pq 
+    pq
     pql
     prance
     premailer
diff --git a/contrib/restricted/boost/boost/multiprecision/cpp_int.hpp b/contrib/restricted/boost/boost/multiprecision/cpp_int.hpp
index 7f2490feee..8490541159 100644
--- a/contrib/restricted/boost/boost/multiprecision/cpp_int.hpp
+++ b/contrib/restricted/boost/boost/multiprecision/cpp_int.hpp
@@ -467,13 +467,13 @@ public:
       BOOST_CONSTEXPR cpp_int_base(const cpp_int_base& a, const literals::detail::negate_tag&)
          : m_wrapper(a.m_wrapper), m_limbs(a.m_limbs), m_sign((a.m_limbs == 1) && (*a.limbs() == 0) ? false : !a.m_sign) {}
 #endif
-#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION 
+#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION
+   //
+   // These are deprecated in C++20 unless we make them explicit:
+   //
+   constexpr cpp_int_base& operator=(const cpp_int_base&) = default;
+#endif
    //
-   // These are deprecated in C++20 unless we make them explicit: 
-   // 
-   constexpr cpp_int_base& operator=(const cpp_int_base&) = default; 
-#endif 
-   // 
    // Helper functions for getting at our internal data, and manipulating storage:
    //
    BOOST_MP_FORCEINLINE unsigned size()const BOOST_NOEXCEPT { return m_limbs; }
@@ -651,12 +651,12 @@ public:
       : m_wrapper(o.m_wrapper), m_limbs(o.m_limbs) {}
    // Defaulted functions:
    //~cpp_int_base() BOOST_NOEXCEPT {}
-#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION 
-   // 
-   // These are deprecated in C++20 unless we make them explicit: 
-   // 
-   constexpr cpp_int_base& operator=(const cpp_int_base&) = default; 
-#endif 
+#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION
+   //
+   // These are deprecated in C++20 unless we make them explicit:
+   //
+   constexpr cpp_int_base& operator=(const cpp_int_base&) = default;
+#endif
 
    BOOST_MP_FORCEINLINE void assign(const cpp_int_base& o) BOOST_NOEXCEPT
    {
@@ -820,13 +820,13 @@ public:
       BOOST_CONSTEXPR cpp_int_base(const cpp_int_base& a, const literals::detail::negate_tag&)BOOST_NOEXCEPT
          : m_data(a.m_data), m_sign(a.m_data ? !a.m_sign : false) {}
 #endif
-#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION 
+#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION
+   //
+   // These are deprecated in C++20 unless we make them explicit:
+   //
+   constexpr cpp_int_base& operator=(const cpp_int_base&) = default;
+#endif
    //
-   // These are deprecated in C++20 unless we make them explicit: 
-   // 
-   constexpr cpp_int_base& operator=(const cpp_int_base&) = default; 
-#endif 
-   // 
    // Helper functions for getting at our internal data, and manipulating storage:
    //
    BOOST_MP_FORCEINLINE BOOST_CONSTEXPR unsigned size()const BOOST_NOEXCEPT { return 1; }
@@ -983,13 +983,13 @@ public:
       BOOST_CONSTEXPR cpp_int_base(literals::detail::value_pack<a, b>) BOOST_NOEXCEPT
          : m_data(static_cast<local_limb_type>(a) | (static_cast<local_limb_type>(b) << bits_per_limb)) {}
 #endif
-#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION 
+#ifndef BOOST_MP_NO_CONSTEXPR_DETECTION
+   //
+   // These are deprecated in C++20 unless we make them explicit:
+   //
+   constexpr cpp_int_base& operator=(const cpp_int_base&) = default;
+#endif
    //
-   // These are deprecated in C++20 unless we make them explicit: 
-   // 
-   constexpr cpp_int_base& operator=(const cpp_int_base&) = default; 
-#endif 
-   // 
    // Helper functions for getting at our internal data, and manipulating storage:
    //
    BOOST_MP_FORCEINLINE BOOST_CONSTEXPR unsigned size()const BOOST_NOEXCEPT { return 1; }
diff --git a/contrib/restricted/boost/boost/regex/v4/regex_token_iterator.hpp b/contrib/restricted/boost/boost/regex/v4/regex_token_iterator.hpp
index 9b46576a64..d44b9457df 100644
--- a/contrib/restricted/boost/boost/regex/v4/regex_token_iterator.hpp
+++ b/contrib/restricted/boost/boost/regex/v4/regex_token_iterator.hpp
@@ -66,8 +66,8 @@ class regex_token_iterator_implementation
    std::vector<int>                     subs;   // the sub-expressions to enumerate
 
 public:
-   regex_token_iterator_implementation(const regex_token_iterator_implementation& other) 
-      : what(other.what), base(other.base), end(other.end), re(other.re), flags(other.flags), result(other.result), N(other.N), subs(other.subs) {} 
+   regex_token_iterator_implementation(const regex_token_iterator_implementation& other)
+      : what(other.what), base(other.base), end(other.end), re(other.re), flags(other.flags), result(other.result), N(other.N), subs(other.subs) {}
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, int sub, match_flag_type f)
       : end(last), re(*p), flags(f){ subs.push_back(sub); }
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector<int>& v, match_flag_type f)
diff --git a/contrib/tools/bison/bison/data/lalr1.cc b/contrib/tools/bison/bison/data/lalr1.cc
index 56df7a53a2..f4f51c78c7 100644
--- a/contrib/tools/bison/bison/data/lalr1.cc
+++ b/contrib/tools/bison/bison/data/lalr1.cc
@@ -307,8 +307,8 @@ b4_location_define])])[
       typedef basic_symbol<by_state> super_type;
       /// Construct an empty symbol.
       stack_symbol_type ();
-      /// Copy construct. 
-      stack_symbol_type (const stack_symbol_type& that); 
+      /// Copy construct.
+      stack_symbol_type (const stack_symbol_type& that);
       /// Steal the contents from \a sym to build this.
       stack_symbol_type (state_type s, symbol_type& sym);
       /// Assignment, needed by push_back.
@@ -566,13 +566,13 @@ m4_if(b4_prefix, [yy], [],
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()
   {}
 
-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that) 
-    : super_type (that.state]b4_locations_if([, that.location])[) 
-  { 
-    ]b4_variant_if([b4_symbol_variant([that.type_get ()], 
-                                      [value], [copy], [that.value])], 
-                   [[value = that.value;]])[ 
-  } 
+  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that)
+    : super_type (that.state]b4_locations_if([, that.location])[)
+  {
+    ]b4_variant_if([b4_symbol_variant([that.type_get ()],
+                                      [value], [copy], [that.value])],
+                   [[value = that.value;]])[
+  }
 
   inline
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)