| Index: trunk/tools/editor_trends/analyses/plugins/ppi_editor_productivity.py |
| — | — | @@ -29,28 +29,24 @@ |
| 30 | 30 | |
| 31 | 31 | edits = editor['character_count'] |
| 32 | 32 | username = editor['username'] |
| 33 | | -<<<<<<< .mine |
| 34 | | - |
| 35 | | -======= |
| 36 | | ->>>>>>> .r88955 |
| 37 | 33 | try: |
| 38 | 34 | added = edits['2010']['11']['0']['added'] |
| 39 | 35 | except KeyError: |
| 40 | | -<<<<<<< .mine |
| | 36 | + |
| 41 | 37 | added = 0 |
| 42 | 38 | try: |
| 43 | 39 | removed = edits['2010']['11']['0']['removed'] |
| 44 | 40 | except KeyError: |
| 45 | 41 | removed = 0 |
| 46 | 42 | |
| 47 | | -======= |
| | 43 | + |
| 48 | 44 | added = 0 |
| 49 | 45 | try: |
| 50 | 46 | removed = edits['2010']['11']['0']['removed'] |
| 51 | 47 | except KeyError: |
| 52 | 48 | removed = 0 |
| 53 | | ->>>>>>> .r88955 |
| 54 | 49 | |
| | 50 | + |
| 55 | 51 | key = datetime(2010, 11, 30) |
| 56 | 52 | if added > 0: |
| 57 | 53 | var.add(key, added, {'username': username, 'added': 'added'}) |