diff options
| author | Al Korgun <alkorgun@gmail.com> | 2013-08-31 09:49:37 +0400 |
|---|---|---|
| committer | Al Korgun <alkorgun@gmail.com> | 2013-08-31 09:49:37 +0400 |
| commit | 9545b467065214e1641ecc52b624f57f4fe9e84b (patch) | |
| tree | 43e108c02ba3083fbf2e8679838f5ea9567ed5aa | |
| parent | 925c5033bb5c78e73db2cd9aec34274df02b75dc (diff) | |
update of librarys
| -rw-r--r-- | BlackSmith.py | 4 | ||||
| -rw-r--r-- | expansions/interpreter/code.py | 14 | ||||
| -rw-r--r-- | librarys.zip | bin | 99336 -> 98410 bytes |
3 files changed, 9 insertions, 9 deletions
diff --git a/BlackSmith.py b/BlackSmith.py index 46ed62a..1d7c45a 100644 --- a/BlackSmith.py +++ b/BlackSmith.py @@ -170,8 +170,8 @@ class SelfExc(Exception): pass def check_sqlite(): - - assert itypes.sqlite3, "py-sqlite3 required" + if not itypes.sqlite3: + raise SelfExc("py-sqlite3 required") def exc_info(): exc, err, tb = sys.exc_info() diff --git a/expansions/interpreter/code.py b/expansions/interpreter/code.py index 33b9266..0a792a2 100644 --- a/expansions/interpreter/code.py +++ b/expansions/interpreter/code.py @@ -1,8 +1,8 @@ # coding: utf-8 # BlackSmith mark.2 -# exp_name = "interpreter" # /code.py v.x11 -# Id: 04~9c +# exp_name = "interpreter" # /code.py v.x12 +# Id: 04~10c # Idea © (2002-2005) by Mike Mintz [mikemintz@gmail.com] # Idea © (2007) by Als [Als@exploit.in] # Code © (2009-2013) by WitcherGeralt [alkorgun@gmail.com] @@ -51,15 +51,15 @@ class expansion_temp(expansion): opts.add(temp) body = args.pop() if not all([(temp in opts) for temp in self.opts[-2:]]): - if (self.opt_silent in opts): + if self.opt_silent in opts: silent = True try: - exec(unicode(body + chr(10)), (locals if (self.opt_locals in opts) else globals)()) - except Exception, exc: - answer = exc_str(exc) + exec(unicode(body + chr(10)), (locals if self.opt_locals in opts else globals)()) + except: + answer = "%s - %s" % exc_info() else: try: - answer = unicode(result) if (self.opt_result in opts) else AnsBase[4] + answer = unicode(result) if self.opt_result in opts else AnsBase[4] except Exception, exc: answer = exc_str(exc) else: diff --git a/librarys.zip b/librarys.zip Binary files differindex 06ae3ce..b82ca30 100644 --- a/librarys.zip +++ b/librarys.zip |