[Python-apps-commits] r12089 - in packages/crudini/trunk (7 files)

lfaraone at users.alioth.debian.org lfaraone at users.alioth.debian.org
Sun Jul 12 00:21:50 UTC 2015


    Date: Sunday, July 12, 2015 @ 00:21:47
  Author: lfaraone
Revision: 12089

Remove upstream sources accidentally included in package

Modified:
  packages/crudini/trunk/debian/	(properties)
Deleted:
  packages/crudini/trunk/COPYING
  packages/crudini/trunk/README
  packages/crudini/trunk/TODO
  packages/crudini/trunk/crudini
  packages/crudini/trunk/example.ini
  packages/crudini/trunk/tests/

Deleted: packages/crudini/trunk/COPYING
===================================================================
--- packages/crudini/trunk/COPYING	2015-07-10 07:10:52 UTC (rev 12088)
+++ packages/crudini/trunk/COPYING	2015-07-12 00:21:47 UTC (rev 12089)
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

Deleted: packages/crudini/trunk/README
===================================================================
--- packages/crudini/trunk/README	2015-07-10 07:10:52 UTC (rev 12088)
+++ packages/crudini/trunk/README	2015-07-12 00:21:47 UTC (rev 12089)
@@ -1,40 +0,0 @@
-A utility for manipulating ini files
-
-
-crudini --set [--existing] config_file section [param] [value]
-        --get [--format=sh|ini] config_file [section] [param]
-        --del [--existing] config_file section [param]
-        --merge [--existing] config_file [section]
-
-
-Examples:
-
-# Add/Update a var
-crudini --set config_file section parameter value
-
-# Update an existing var
-crudini --set --existing config_file section parameter value
-
-# Delete a var
-crudini --del config_file section parameter
-
-# Delete a section
-crudini --del config_file section
-
-# output a value
-crudini --get config_file section parameter
-
-# output a global value not in a section
-crudini --get config_file '' parameter
-
-# output a section
-crudini --get config_file section
-
-# output a section, parseable by shell
-eval $(crudini --get --format=sh config_file section)
-
-# update an ini file from shell variable(s)
-echo name="$name" | crudini --merge config_file section
-
-# merge an ini file from another ini
-crudini --merge config_file < another.ini

Deleted: packages/crudini/trunk/TODO
===================================================================
--- packages/crudini/trunk/TODO	2015-07-10 07:10:52 UTC (rev 12088)
+++ packages/crudini/trunk/TODO	2015-07-12 00:21:47 UTC (rev 12089)
@@ -1,8 +0,0 @@
-support variables without =
-
-support --set,--merge of #commented name=value
-with operation configured with --comment = {always,unchanged}
-
-support multiple files passed to --merge
-
-possibly support --format=sh|json with --mergea

Deleted: packages/crudini/trunk/crudini
===================================================================
--- packages/crudini/trunk/crudini	2015-07-10 07:10:52 UTC (rev 12088)
+++ packages/crudini/trunk/crudini	2015-07-12 00:21:47 UTC (rev 12089)
@@ -1,314 +0,0 @@
-#!/usr/bin/python
-# vim:fileencoding=utf8
-#
-# Copyright (C) 2013, Pádraig Brady <P at draigBrady.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GPLv2, the GNU General Public License version 2, as
-# published by the Free Software Foundation. http://gnu.org/licenses/gpl.html
-
-import sys
-import ConfigParser
-import getopt
-import iniparse
-import pipes
-import string
-from cStringIO import StringIO
-
-try:
-    iniparse.DEFAULTSECT
-except AttributeError:
-    iniparse.DEFAULTSECT = 'DEFAULT'
-
-def usage(exitval=0):
-    cmd = sys.argv[0]
-    sys.stderr.write(
-      cmd + " --set [--existing] config_file section [param] [value]\n" +
-      cmd + " --get [--format=sh|ini] config_file [section] [param]\n" +
-      cmd + " --del [--existing] config_file section [param]\n" +
-      cmd + " --merge [--existing] config_file [section]\n"
-    )
-    sys.exit(exitval)
-
-def error(message=None):
-    if message:
-        sys.stderr.write(message+'\n')
-
-_sh_safe_id_chars = frozenset(string.ascii_letters + string.digits + '_')
-def valid_sh_identifier(i):
-    if i[0] in string.digits:
-        return False
-    for c in i:
-        if c not in _sh_safe_id_chars:
-            return False
-    return True
-
-def print_section_header(section):
-    if fmt == 'ini':
-        print "[%s]" % section
-    else:
-        print section
-
-def print_name_value(name, value):
-    if fmt == 'sh':
-        # Note we provide validation of the output indentifiers
-        # as it's dangerous to leave validation to shell.
-        # consider for example doing eval on this in shell:
-        #   rm -Rf /;oops=val
-        if not valid_sh_identifier(name):
-            error('Inavlid sh identifier: %s' % name)
-            sys.exit(1)
-        sys.stdout.write("%s=%s\n" % (name, pipes.quote(value)))
-    elif fmt == 'ini':
-        print name, '=', value.replace('\n','\n ')
-    else:
-        print name or value
-
-mode = fmt = update = cfgfile = section = param = value = None
-
-def parse_options():
-    try:
-        long_options = ['set', 'del', 'get', 'merge', 'existing', 'format=',
-                        'help', 'version']
-        opts, args = getopt.getopt(sys.argv[1:], '', long_options)
-    except getopt.GetoptError, e:
-        error(str(e))
-        usage(1)
-
-    global mode, fmt, update, cfgfile, section, param, value
-
-    for o, a in opts:
-        if o in ('--help',):
-            usage(0)
-        elif o in ('--version',):
-            print 'crudini 0.3'
-            sys.exit(0)
-        elif o in ('--set', '--del', '--get', '--merge'):
-            if mode:
-                error('Only one of --set|--del|--get|--merge can be specified')
-                usage(1)
-            mode = o
-        elif o in ('--format',):
-            fmt = a
-            if fmt not in ('sh','ini'):
-                error('--format not recognized: %s' % fmt)
-                usage(1)
-        elif o in ('--existing',):
-            update = True
-
-    if not mode:
-        error('One of --set|--del|--get|--merge must be specified')
-        usage(1)
-
-    try:
-        cfgfile = args[0]
-        section = args[1]
-        param = args[2]
-        value = args[3]
-    except IndexError:
-        pass
-
-    if cfgfile is None:
-        usage(1)
-    if section is None and mode in ('--del', '--set'):
-        usage(1)
-    if param is not None and mode in ('--merge'):
-        usage(1)
-    if value is not None and mode not in ('--set'):
-        error('A value should not be specified with %s' % mode)
-        usage(1)
-
-    if mode == '--merge' and fmt == 'sh':
-        # I'm not sure how useful is is to support this.
-        # printenv will already generate a mostly compat ini format.
-        # If you want to also include non exported vars (from `set`),
-        # then there is a format change.
-        error('sh format input is not supported at present')
-        sys.exit(1)
-
-parse_options()
-
-section_explicit_default = False
-if section == '':
-    section = iniparse.DEFAULTSECT
-elif section == iniparse.DEFAULTSECT:
-    section_explicit_default = True
-
-# XXX: should be done in iniparse.  Used to
-# add support for ini files without a section
-class add_default_section():
-    def __init__(self, fp):
-        self.fp = fp
-        self.first = True
-
-    def readline(self):
-        if self.first:
-            self.first = False
-            return '[%s]' % iniparse.DEFAULTSECT
-        else:
-            return self.fp.readline()
-
-stdin = ""
-
-def _parse_file(filename, add_default=False):
-    # Note we use RawConfigParser rather than SafeConfigParser
-    # to avoid unwanted variable interpolation.
-    # Note iniparse doesn't currently support allow_no_value=True.
-    try:
-        if filename == '-':
-            fp = StringIO(stdin)
-        else:
-            fp = open(filename)
-        if add_default:
-            fp = add_default_section(fp)
-        conf = iniparse.RawConfigParser()
-        conf.readfp(fp)
-        return conf
-    except IOError as e:
-        error(str(e))
-        sys.exit(1)
-
-
-def parse_file(filename):
-    global added_default_section
-    added_default_section = False
-
-    try:
-        conf = _parse_file(filename)
-
-        if not conf.items(iniparse.DEFAULTSECT):
-            # reparse with inserted [DEFAULT] to be able to add global opts etc.
-            # XXX: We don't distinguish the edge case where
-            # there is just [DEFAULT] in a file with no name=values.
-            # In that case a redundant [DEFAULT] will be output.
-            conf = _parse_file(filename, add_default=True)
-            added_default_section = True
-
-    except ConfigParser.MissingSectionHeaderError:
-        conf = _parse_file(filename, add_default=True)
-        added_default_section = True
-    except ConfigParser.ParsingError as e:
-        error(str(e))
-        sys.exit(1)
-
-    return conf
-
-added_default_section = False
-
-if mode == '--merge':
-    stdin = sys.stdin.read() # read all upfront so that we can reparse if needed
-    mconf = parse_file('-')
-
-madded_default_section = added_default_section
-conf = parse_file(cfgfile)
-# Take the [DEFAULT] header from the input if present
-if mode == '--merge' and not update \
-   and not madded_default_section and mconf.items(iniparse.DEFAULTSECT):
-    added_default_section = madded_default_section
-
-def set_name_value(section, param, value):
-    if update:
-        if param is None:
-            _sec = section == iniparse.DEFAULTSECT or conf.has_section(section)
-            if not _sec:
-                raise ConfigParser.NoSectionError(section)
-        else:
-           _val = conf.get(section, param)
-    elif section != iniparse.DEFAULTSECT and not conf.has_section(section):
-        conf.add_section(section)
-
-    if param is not None:
-        if value is None:
-            value = ''
-        conf.set(section, param, value)
-
-try:
-    if mode == '--set':
-        set_name_value(section, param, value)
-    elif mode == '--merge':
-        for msection in [iniparse.DEFAULTSECT] + mconf.sections():
-            if msection == iniparse.DEFAULTSECT:
-                defaults_to_strip = {}
-            else:
-                defaults_to_strip = mconf.defaults()
-            items = mconf.items(msection)
-            set_param = False
-            for item in items:
-                # XXX: Note this doesn't update an item in section
-                # if matching value also in default (global) section.
-                if defaults_to_strip.get(item[0]) != item[1]:
-                    ignore_errs = (ConfigParser.NoOptionError,)
-                    if section is not None:
-                        msection = section
-                    else:
-                        ignore_errs += (ConfigParser.NoSectionError,)
-                    try:
-                        set_param = True
-                        set_name_value(msection, item[0], item[1])
-                    except ignore_errs:
-                        pass
-            # For empty sections ensure the section header is added
-            if not set_param and section is None:
-                set_name_value(msection, None, None)
-    elif mode == '--del':
-        if param is None:
-            if section == iniparse.DEFAULTSECT:
-                for name in conf.defaults():
-                    conf.remove_option(iniparse.DEFAULTSECT, name)
-            else:
-                if not conf.remove_section(section) and update:
-                    raise ConfigParser.NoSectionError(section)
-        elif value is None:
-            if not conf.remove_option(section, param) and update:
-                raise ConfigParser.NoOptionError(section, param)
-    elif mode == '--get':
-        if section is None:
-            if conf.defaults():
-                print_section_header(iniparse.DEFAULTSECT)
-            for item in conf.sections():
-                print_section_header(item)
-        elif param is None:
-            if fmt == 'ini':
-                print_section_header(section)
-            if section == iniparse.DEFAULTSECT:
-                defaults_to_strip = {}
-            else:
-                defaults_to_strip = conf.defaults()
-            for item in conf.items(section):
-                # XXX: Note this strips an item from section
-                # if matching value also in default (global) section.
-                if defaults_to_strip.get(item[0]) != item[1]:
-                    if fmt:
-                        val = item[1]
-                    else:
-                        val = None
-                    print_name_value(item[0], val)
-        else:
-            val = conf.get(section, param)
-            if fmt:
-                name = param
-            else:
-                name = None
-            print_name_value(name, val)
-except ConfigParser.NoSectionError:
-    error('Section not found: %s' % section)
-    sys.exit(1)
-except ConfigParser.NoOptionError:
-    error('Parameter not found: %s' % param)
-    sys.exit(1)
-
-if mode != '--get':
-    with open(cfgfile, 'w') as f:
-        # XXX: Ideally we should just do conf.write(f) here,
-        # but to avoid iniparse issues, we massage the data a little here
-        str_data = str(conf.data)
-        if len(str_data) and str_data[-1] != '\n':
-            str_data += '\n'
-
-        if (
-            (added_default_section and not (section_explicit_default and mode in ('--set', '--merge')))
-            or (mode == '--del' and section == iniparse.DEFAULTSECT and param is None)
-           ):
-            str_data = str_data.replace('[%s]\n' % iniparse.DEFAULTSECT, '', 1)
-
-        f.write(str_data)


Property changes on: packages/crudini/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Deleted: packages/crudini/trunk/example.ini
===================================================================
--- packages/crudini/trunk/example.ini	2015-07-10 07:10:52 UTC (rev 12088)
+++ packages/crudini/trunk/example.ini	2015-07-12 00:21:47 UTC (rev 12089)
@@ -1,38 +0,0 @@
-global=supported
-
-[section1]
-dup1 = val1
-dup1 = val1
-dup2 = val1
-dup2 = val2
-nospace=val
-multiline = with
-   leading
- space
-nmultiline=not supported with\
-;comment
-#comment
-comment_after1=val ;a comment
-comment_after2=val;not a comment
-comment_after3=val #not a comment
-escaped_not_processed=test \nescape
-colon:val ; supported also
-double_quotes = "not removed"
-single_quotes = 'not removed'
-spaces_stripped =     val    ;
-internal_not_stripped =    v  al   ;
-notempty1=  ;comment=val
-;Note iniparse requires the = following empty
-empty=
-python_interpolate = %(dup1)s/blah
-interpolate2 = ${dup1}/blah
-Caps = not significant
-
-[section1]
-combine=sections
-
-[non-sh-compat]
-space name=val
-útf8name=val
-1num=val
-ls;name=val




More information about the Python-apps-commits mailing list