[Python-checkins] r75345 - in python/branches/py3k: Demo/scripts/README Demo/scripts/primes.py

[georg.brandl]

Author: georg.brandl
Date: Sun Oct 11 10:49:57 2009
New Revision: 75345

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Demo/scripts/README
   python/branches/py3k/Demo/scripts/primes.py

Modified: python/branches/py3k/Demo/scripts/README
==============================================================================
--- python/branches/py3k/Demo/scripts/README	(original)
+++ python/branches/py3k/Demo/scripts/README	Sun Oct 11 10:49:57 2009
@@ -2,7 +2,7 @@
 
 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

Modified: python/branches/py3k/Demo/scripts/primes.py
==============================================================================
--- python/branches/py3k/Demo/scripts/primes.py	(original)
+++ python/branches/py3k/Demo/scripts/primes.py	Sun Oct 11 10:49:57 2009
@@ -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()