| @@ 118-131 (lines=14) @@ | ||
| 115 | except ValueError: |
|
| 116 | # Last section wasn't an int |
|
| 117 | amember = memberForName(name, server) |
|
| 118 | if amember: |
|
| 119 | # Name was just a member - return |
|
| 120 | return { "Member" : amember, "Int" : None } |
|
| 121 | else: |
|
| 122 | # Now we check if we got an ID instead |
|
| 123 | # Get just the numbers |
|
| 124 | memID = ''.join(list(filter(str.isdigit, name))) |
|
| 125 | newMem = memberForID(memID, server) |
|
| 126 | if newMem: |
|
| 127 | # We FOUND it! |
|
| 128 | return { "Member" : newMem, "Int" : None } |
|
| 129 | else: |
|
| 130 | # Nothing was right about this... |
|
| 131 | return { "Member" : None, "Int" : None } |
|
| 132 | # Should never get here |
|
| 133 | return None |
|
| 134 | ||
| @@ 83-96 (lines=14) @@ | ||
| 80 | # Only one part - no int included (or not separated by space) |
|
| 81 | # Check if member exists - and if not throw an error, if so, throw a diff error |
|
| 82 | amember = memberForName(name, server) |
|
| 83 | if amember: |
|
| 84 | # We at least have a member |
|
| 85 | return { "Member" : amember, "Int" : None } |
|
| 86 | else: |
|
| 87 | # Now we check if we got an ID instead |
|
| 88 | # Get just the numbers |
|
| 89 | memID = ''.join(list(filter(str.isdigit, name))) |
|
| 90 | newMem = memberForID(memID, server) |
|
| 91 | if newMem: |
|
| 92 | # We FOUND it! |
|
| 93 | return { "Member" : newMem, "Int" : None } |
|
| 94 | else: |
|
| 95 | # Nothing was right about this... |
|
| 96 | return { "Member" : None, "Int" : None } |
|
| 97 | try: |
|
| 98 | # Let's cast the last item as an int and catch any exceptions |
|
| 99 | theInt = int(theList[len(theList)-1]) |
|