Browse code
Resolving conflict
Ed L authored on 03/03/2012 23:33:15Showing 1 changed files
| ... | ... |
@@ -162,9 +162,9 @@ if __name__ == '__main__': |
| 162 | 162 |
|
| 163 | 163 |
import random |
| 164 | 164 |
def shuffled(lis): |
| 165 |
- lis = lis[:] |
|
| 166 |
- random.shuffle(lis) |
|
| 167 |
- return iter(lis) |
|
| 165 |
+ lis = lis[:] |
|
| 166 |
+ random.shuffle(lis) |
|
| 167 |
+ return iter(lis) |
|
| 168 | 168 |
|
| 169 | 169 |
|
| 170 | 170 |
for obj_name in shuffled(['first_obj', 'second_obj', 'third_obj']): |