Changeset 391 for python/trunk/Demo/scripts/primes.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Demo/scripts/primes.py (modified) (2 diffs)

python/trunk/Demo/scripts/primes.py

@@ -2 +2 @@
 
 # Print prime numbers in a given range
+
+def primes(min, max):
+    if max >= 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():
@@ -7 +22 @@
     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__":