Merged revisions 75344 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75344 | georg.brandl | 2009-10-11 10:48:28 +0200 (So, 11 Okt 2009) | 1 line

  Update primes script.
........

diff --git a/Demo/scripts/README b/Demo/scripts/README
index 18f0de8d5525cbeb3aba3c0cac3181158d05a3ef..bf0f14264132bd8c3d59fdc8f19bbf60de6d94a5 100644 (file)
--- a/Demo/scripts/README
+++ b/Demo/scripts/README
@@ -2,7 +2,7 @@ This directory contains a collection of executable Python scripts.
 
 See also the Tools/scripts directory!
 
-beer.py                        Print the classic 'bottles of beer' list.
+beer.py                        Print the classic 'bottles of beer' list
 eqfix.py               Fix .py files to use the correct equality test operator
 fact.py                        Factorize numbers
 find-uname.py          Search for Unicode characters using regexps

diff --git a/Demo/scripts/primes.py b/Demo/scripts/primes.py
index 0924aab8e7b04ee83c3506a46ca764af3b6db90e..65da42e2626811d421f7101360bde646ee02cbb3 100755 (executable)
--- a/Demo/scripts/primes.py
+++ b/Demo/scripts/primes.py
@@ -2,26 +2,30 @@
 
 # Print prime numbers in a given range
 
+def primes(min, max):
+    if 2 >= min:
+        print(2)
+    primes = [2]
+    i = 3
+    while i <= max:
+        for p in primes:
+            if i % p == 0 or p*p > i:
+                break
+        if i % p != 0:
+            primes.append(i)
+            if i >= min:
+                print(i)
+        i += 2
+
 def main():
     import sys
     min, max = 2, 0x7fffffff
     if sys.argv[1:]:
-        min = int(eval(sys.argv[1]))
+        min = int(sys.argv[1])
         if sys.argv[2:]:
-            max = int(eval(sys.argv[2]))
+            max = int(sys.argv[2])
     primes(min, max)
 
-def primes(min, max):
-    if 2 >= min: print(2)
-    primes = [2]
-    i = 3
-    while i <= max:
-        for p in primes:
-            if i%p == 0 or p*p > i: break
-        if i%p != 0:
-            primes.append(i)
-            if i >= min: print(i)
-        i = i+2
 
 if __name__ == "__main__":
     main()