diff options
author | shadchin <[email protected]> | 2022-02-10 16:44:39 +0300 |
---|---|---|
committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:44:39 +0300 |
commit | e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0 (patch) | |
tree | 64175d5cadab313b3e7039ebaa06c5bc3295e274 /contrib/python/iniconfig/patches/01-arcadia.patch | |
parent | 2598ef1d0aee359b4b6d5fdd1758916d5907d04f (diff) |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'contrib/python/iniconfig/patches/01-arcadia.patch')
-rw-r--r-- | contrib/python/iniconfig/patches/01-arcadia.patch | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/contrib/python/iniconfig/patches/01-arcadia.patch b/contrib/python/iniconfig/patches/01-arcadia.patch index b62a7c2f8e7..16d9cd88a40 100644 --- a/contrib/python/iniconfig/patches/01-arcadia.patch +++ b/contrib/python/iniconfig/patches/01-arcadia.patch @@ -1,26 +1,26 @@ ---- contrib/python/iniconfig/iniconfig/__init__.py (index) -+++ contrib/python/iniconfig/iniconfig/__init__.py (working tree) -@@ -1,6 +1,7 @@ - """ brain-dead simple parser for ini-style files. - (C) Ronny Pfannschmidt, Holger Krekel -- MIT licensed - """ -+import os - __all__ = ['IniConfig', 'ParseError'] - - COMMENTCHARS = "#;" -@@ -49,7 +50,14 @@ class IniConfig(object): - def __init__(self, path, data=None): - self.path = str(path) # convenience - if data is None: -- f = open(self.path) -+ if os.path.basename(self.path).startswith('pkg:'): -+ import io, pkgutil -+ -+ _, package, resource = self.path.split(':') -+ content = pkgutil.get_data(package, resource) -+ f = io.StringIO(content.decode('utf-8')) -+ else: -+ f = open(self.path) - try: - tokens = self._parse(iter(f)) - finally: +--- contrib/python/iniconfig/iniconfig/__init__.py (index) ++++ contrib/python/iniconfig/iniconfig/__init__.py (working tree) +@@ -1,6 +1,7 @@ + """ brain-dead simple parser for ini-style files. + (C) Ronny Pfannschmidt, Holger Krekel -- MIT licensed + """ ++import os + __all__ = ['IniConfig', 'ParseError'] + + COMMENTCHARS = "#;" +@@ -49,7 +50,14 @@ class IniConfig(object): + def __init__(self, path, data=None): + self.path = str(path) # convenience + if data is None: +- f = open(self.path) ++ if os.path.basename(self.path).startswith('pkg:'): ++ import io, pkgutil ++ ++ _, package, resource = self.path.split(':') ++ content = pkgutil.get_data(package, resource) ++ f = io.StringIO(content.decode('utf-8')) ++ else: ++ f = open(self.path) + try: + tokens = self._parse(iter(f)) + finally: |