1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/allpy/argparse_validators.py	Tue Feb 22 19:12:36 2011 +0300
     1.3 @@ -0,0 +1,63 @@
     1.4 +
     1.5 +import argparse
     1.6 +
     1.7 +def f_nng(string):
     1.8 +    """ Validates nonnegative (>=0) float """
     1.9 +    try:
    1.10 +        value = float(string)
    1.11 +    except:
    1.12 +        msg = "%r is wrong float" % string
    1.13 +        raise argparse.ArgumentTypeError(msg)
    1.14 +    if value < 0:
    1.15 +        msg = "%r is negative" % string
    1.16 +        raise argparse.ArgumentTypeError(msg)
    1.17 +    return value
    1.18 +
    1.19 +def part(string):
    1.20 +    """ Validates 0.0 <= float <= 1.0 """
    1.21 +    try:
    1.22 +        value = float(string)
    1.23 +    except:
    1.24 +        msg = "%r is wrong float" % string
    1.25 +        raise argparse.ArgumentTypeError(msg)
    1.26 +    if not (0.0 <= value <= 1.0):
    1.27 +        msg = "%r is not float, representing part, ie in [0, 1]" % string
    1.28 +        raise argparse.ArgumentTypeError(msg)
    1.29 +    return value
    1.30 +
    1.31 +def timeout(string):
    1.32 +    """ Validates int >= -1 """
    1.33 +    try:
    1.34 +        value = int(string)
    1.35 +    except:
    1.36 +        msg = "%r is wrong integer" % string
    1.37 +        raise argparse.ArgumentTypeError(msg)
    1.38 +    if value < -1:
    1.39 +        msg = "integer %r is less than -1" % string
    1.40 +        raise argparse.ArgumentTypeError(msg)
    1.41 +    return value
    1.42 +
    1.43 +def pos(string):
    1.44 +    """ Validates positive integer """
    1.45 +    try:
    1.46 +        value = int(string)
    1.47 +    except:
    1.48 +        msg = "%r is wrong integer" % string
    1.49 +        raise argparse.ArgumentTypeError(msg)
    1.50 +    if value < 1:
    1.51 +        msg = "%r is not positive integer" % string
    1.52 +        raise argparse.ArgumentTypeError(msg)
    1.53 +    return value
    1.54 +
    1.55 +def i_nng(string):
    1.56 +    """ Validates int >= 0 """
    1.57 +    try:
    1.58 +        value = int(string)
    1.59 +    except:
    1.60 +        msg = "%r is wrong integer" % string
    1.61 +        raise argparse.ArgumentTypeError(msg)
    1.62 +    if value < 0:
    1.63 +        msg = "integer %r is less than 0" % string
    1.64 +        raise argparse.ArgumentTypeError(msg)
    1.65 +    return value
    1.66 +

     2.1 --- a/geometrical_core/argparse_validators.py	Tue Feb 22 19:10:24 2011 +0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,63 +0,0 @@
     2.4 -
     2.5 -import argparse
     2.6 -
     2.7 -def f_nng(string):
     2.8 -    """ Validates nonnegative (>=0) float """
     2.9 -    try:
    2.10 -        value = float(string)
    2.11 -    except:
    2.12 -        msg = "%r is wrong float" % string
    2.13 -        raise argparse.ArgumentTypeError(msg)
    2.14 -    if value < 0:
    2.15 -        msg = "%r is negative" % string
    2.16 -        raise argparse.ArgumentTypeError(msg)
    2.17 -    return value
    2.18 -
    2.19 -def part(string):
    2.20 -    """ Validates 0.0 <= float <= 1.0 """
    2.21 -    try:
    2.22 -        value = float(string)
    2.23 -    except:
    2.24 -        msg = "%r is wrong float" % string
    2.25 -        raise argparse.ArgumentTypeError(msg)
    2.26 -    if not (0.0 <= value <= 1.0):
    2.27 -        msg = "%r is not float, representing part, ie in [0, 1]" % string
    2.28 -        raise argparse.ArgumentTypeError(msg)
    2.29 -    return value
    2.30 -
    2.31 -def timeout(string):
    2.32 -    """ Validates int >= -1 """
    2.33 -    try:
    2.34 -        value = int(string)
    2.35 -    except:
    2.36 -        msg = "%r is wrong integer" % string
    2.37 -        raise argparse.ArgumentTypeError(msg)
    2.38 -    if value < -1:
    2.39 -        msg = "integer %r is less than -1" % string
    2.40 -        raise argparse.ArgumentTypeError(msg)
    2.41 -    return value
    2.42 -
    2.43 -def pos(string):
    2.44 -    """ Validates positive integer """
    2.45 -    try:
    2.46 -        value = int(string)
    2.47 -    except:
    2.48 -        msg = "%r is wrong integer" % string
    2.49 -        raise argparse.ArgumentTypeError(msg)
    2.50 -    if value < 1:
    2.51 -        msg = "%r is not positive integer" % string
    2.52 -        raise argparse.ArgumentTypeError(msg)
    2.53 -    return value
    2.54 -
    2.55 -def i_nng(string):
    2.56 -    """ Validates int >= 0 """
    2.57 -    try:
    2.58 -        value = int(string)
    2.59 -    except:
    2.60 -        msg = "%r is wrong integer" % string
    2.61 -        raise argparse.ArgumentTypeError(msg)
    2.62 -    if value < 0:
    2.63 -        msg = "integer %r is less than 0" % string
    2.64 -        raise argparse.ArgumentTypeError(msg)
    2.65 -    return value
    2.66 -

     3.1 --- a/geometrical_core/geometrical-core	Tue Feb 22 19:10:24 2011 +0300
     3.2 +++ b/geometrical_core/geometrical-core	Tue Feb 22 19:12:36 2011 +0300
     3.3 @@ -12,7 +12,8 @@
     3.4  from allpy import markup
     3.5  from allpy import fileio
     3.6  from spt import gcs_to_spt
     3.7 -from argparse_validators import f_nng, part, timeout, pos, i_nng
     3.8 +
     3.9 +from allpy.argparse_validators import f_nng, part, timeout, pos, i_nng
    3.10  
    3.11  r = argparse.FileType('r')
    3.12  w = argparse.FileType('w')