From 4618c7e39e3bb76283e5d4f29f0d401830f98acc Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Aug 2014 10:21:16 -0400 Subject: [PATCH] added python3 compatibility by catching the errors with xrange --- forgery_py/forgery/basic.py | 9 +++++++-- forgery_py/forgery/internet.py | 5 ++++- forgery_py/forgery/lorem_ipsum.py | 8 ++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/forgery_py/forgery/basic.py b/forgery_py/forgery/basic.py index 36a75db..da47aa7 100644 --- a/forgery_py/forgery/basic.py +++ b/forgery_py/forgery/basic.py @@ -70,7 +70,12 @@ def text(length=None, at_least=10, at_most=15, lowercase=True, length = random.randint(at_least, at_most) result = '' - for i in xrange(0, length): - result += random.choice(base_string) + try: + for i in xrange(0, length): + result += random.choice(base_string) + except NameError: + for i in range(0, length): + result += random.choice(base_string) + return result diff --git a/forgery_py/forgery/internet.py b/forgery_py/forgery/internet.py index 3fd0fce..4566144 100644 --- a/forgery_py/forgery/internet.py +++ b/forgery_py/forgery/internet.py @@ -90,4 +90,7 @@ def cctld(): def ip_v4(): """Random IPv4 address.""" - return '.'.join([str(random.randint(0, 255)) for i in xrange(0, 4)]) + try: + return '.'.join([str(random.randint(0, 255)) for i in xrange(0, 4)]) + except NameError: + return '.'.join([str(random.randint(0, 255)) for i in xrange(0, 4)]) diff --git a/forgery_py/forgery/lorem_ipsum.py b/forgery_py/forgery/lorem_ipsum.py index 8893809..295a956 100644 --- a/forgery_py/forgery/lorem_ipsum.py +++ b/forgery_py/forgery/lorem_ipsum.py @@ -97,8 +97,12 @@ def paragraphs(quantity=2, separator='\n\n', wrap_start='', wrap_end='', separator = '\n\n' result = [] - for i in xrange(0, quantity): - result.append(wrap_start + sentences(sentences_quantity) + wrap_end) + try: + for i in xrange(0, quantity): + result.append(wrap_start + sentences(sentences_quantity) + wrap_end) + except NameError: + for i in range(0, quantity): + result.append(wrap_start + sentences(sentences_quantity) + wrap_end) if as_list: return result