Changeset 391 for python/trunk/Demo/scripts/pi.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/pi.py (modified) (2 diffs)

python/trunk/Demo/scripts/pi.py

@@ -12 +12 @@
 
 def main():
-    k, a, b, a1, b1 = 2L, 4L, 1L, 12L, 4L
-    while 1:
+    k, a, b, a1, b1 = 2, 4, 1, 12, 4
+    while True:
         # Next approximation
-        p, q, k = k*k, 2L*k+1L, k+1L
+        p, q, k = k*k, 2*k+1, k+1
         a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1
         # Print common digits
@@ -21 +21 @@
         while d == d1:
             output(d)
-            a, a1 = 10L*(a%b), 10L*(a1%b1)
+            a, a1 = 10*(a%b), 10*(a1%b1)
             d, d1 = a//b, a1//b1
 
 def output(d):
     # Use write() to avoid spaces between the digits
-    # Use str() to avoid the 'L'
     sys.stdout.write(str(d))
     # Flush so the output is seen immediately