Skip to content

Commit 227bd0f

Browse files
author
Maximilian Karl
committed
solved error: ignore Alias if already there in Utility
(define_unknown_user)
1 parent 1dc373f commit 227bd0f

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

docs/changes.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,9 @@ Version 1.1.11 (July 29, 2021)
9898
Version 1.1.12 (July 29, 2021)
9999
-----------------------------------
100100

101-
* solved error: check for numpy is nan in Utility
101+
* solved error: check for numpy is nan in Utility
102+
103+
Version 1.1.13 (July 29, 2021)
104+
-----------------------------------
105+
106+
* solved error: ignore Alias if already there in Utility(define_unknown_user)

github2pandas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.12'
1+
__version__ = '1.1.13'

github2pandas/utility.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,14 @@ def define_unknown_user(user_dict, unknown_user, data_root_dir):
701701
alias = ""
702702
user = p_user.iloc[0]
703703
if "alias" in user:
704-
if numpy.isnan(user["alias"]) or (user["alias"] is None):
704+
if pd.isnull(user["alias"]) or (user["alias"] is None):
705705
alias = unknown_user
706706
else:
707-
alias = user["alias"] + ";" + unknown_user
707+
all_alias = user["alias"].split(';')
708+
if not unknown_user in all_alias:
709+
alias = user["alias"] + ";" + unknown_user
710+
else:
711+
alias = user["alias"]
708712
else:
709713
alias = unknown_user
710714
users.loc[users.anonym_uuid == user_dict[unknown_user], 'alias'] = alias

tests/test_utility.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ class User2:
302302
login = "test_define_unknown_user2"
303303
user2 = Utility.extract_user_data(User2(), self.users_ids, self.default_data_folder)
304304
new_user = Utility.define_unknown_user({"test2":user2},"test2",self.default_data_folder)
305+
new_user = Utility.define_unknown_user({"test3":user2},"test3",self.default_data_folder)
306+
new_user = Utility.define_unknown_user({"test3":user2},"test3",self.default_data_folder)
305307
print(Utility.get_users(self.default_data_folder))
306308

307309
def setUp(self):

0 commit comments

Comments
 (0)