diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 14:01:29 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-25 14:01:29 (GMT) |
| commit | e31bcc76b3fec3d3311f32ffb4e324693a26db84 (patch) | |
| tree | e31ae28f90ffbbb602c8221b5faa453e3430e715 | |
| parent | 56229aad368973c66eae89d4282ace59f7778024 (diff) | |
| parent | 804848ba473396a33a4e457ebb6f688926549057 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
| -rw-r--r-- | shell/view/Makefile.am | 1 | ||||
| -rw-r--r-- | sugar/util.py | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am index d291cf3..e932ff0 100644 --- a/shell/view/Makefile.am +++ b/shell/view/Makefile.am @@ -4,6 +4,7 @@ sugardir = $(pkgdatadir)/shell/view sugar_PYTHON = \ __init__.py \ ActivityHost.py \ + BuddyActivityView.py \ ConsoleWindow.py \ FirstTimeDialog.py \ BuddyIcon.py \ diff --git a/sugar/util.py b/sugar/util.py index 9cb7d55..1584fd8 100644 --- a/sugar/util.py +++ b/sugar/util.py @@ -18,12 +18,12 @@ class GObjectSingletonMeta(gobject.GObjectMeta): klass.__instance = gobject.GObjectMeta.__call__(klass, *args, **kwargs) return klass.__instance -def _stringify_sha(sha_hash): - """Convert binary sha1 hash data into printable characters.""" - print_sha = "" - for char in sha_hash: - print_sha = print_sha + binascii.b2a_hex(char) - return print_sha +def printable_hash(in_hash): + """Convert binary hash data into printable characters.""" + printable = "" + for char in in_hash: + printable = printable + binascii.b2a_hex(char) + return printable def _sha_data(data): """sha1 hash some bytes.""" @@ -33,7 +33,7 @@ def _sha_data(data): def unique_id(data = ''): data_string = "%s%s%s" % (time.time(), random.randint(10000, 100000), data) - return _stringify_sha(_sha_data(data_string)) + return printable_hash(_sha_data(data_string)) ACTIVITY_ID_LEN = 40 |