[Pysvnmanager-svn] SF.net SVN: pysvnmanager:[48] trunk

[<ji...@us...>]

Revision: 48
          http://pysvnmanager.svn.sourceforge.net/pysvnmanager/?rev=48&view=rev
Author:   jiangx
Date:     2008-08-28 15:58:56 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
upgrade to 0.2.1; format exception message; 

Modified Paths:
--------------
    trunk/pySvnManager.egg-info/SOURCES.txt
    trunk/pysvnmanager/controllers/authz.py
    trunk/pysvnmanager/controllers/repos.py
    trunk/pysvnmanager/controllers/role.py
    trunk/pysvnmanager/hooks/plugins/ReadonlySvnMirror.py
    trunk/pysvnmanager/lib/base.py
    trunk/pysvnmanager/websetup.py
    trunk/setup.py

Modified: trunk/pySvnManager.egg-info/SOURCES.txt
===================================================================
--- trunk/pySvnManager.egg-info/SOURCES.txt	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pySvnManager.egg-info/SOURCES.txt	2008-08-28 15:58:56 UTC (rev 48)
@@ -20,16 +20,11 @@
 pysvnmanager/__init__.py
 pysvnmanager/websetup.py
 pysvnmanager/config/DefaultConfig.py
-pysvnmanager/config/DefaultConfig.pyc
 pysvnmanager/config/__init__.py
-pysvnmanager/config/__init__.pyc
 pysvnmanager/config/environment.py
-pysvnmanager/config/environment.pyc
 pysvnmanager/config/localconfig.py.in
 pysvnmanager/config/middleware.py
-pysvnmanager/config/middleware.pyc
 pysvnmanager/config/routing.py
-pysvnmanager/config/routing.pyc
 pysvnmanager/config/svn.access.in
 pysvnmanager/config/svn.passwd.in
 pysvnmanager/controllers/__init__.py
@@ -53,6 +48,28 @@
 pysvnmanager/hooks/init/hook1.4/pre-revprop-change
 pysvnmanager/hooks/init/hook1.4/pre-unlock.tmpl
 pysvnmanager/hooks/init/hook1.4/start-commit
+pysvnmanager/hooks/init/hook1.4/scripts/README
+pysvnmanager/hooks/init/hook1.4/scripts/check-authz.py
+pysvnmanager/hooks/init/hook1.4/scripts/check-case-insensitive.pl
+pysvnmanager/hooks/init/hook1.4/scripts/check-case-insensitive.py
+pysvnmanager/hooks/init/hook1.4/scripts/check-mime-type.pl
+pysvnmanager/hooks/init/hook1.4/scripts/check-mime-type.py
+pysvnmanager/hooks/init/hook1.4/scripts/commit-access-control.cfg
+pysvnmanager/hooks/init/hook1.4/scripts/commit-access-control.cfg.example
+pysvnmanager/hooks/init/hook1.4/scripts/commit-access-control.pl
+pysvnmanager/hooks/init/hook1.4/scripts/commit-block-joke.py
+pysvnmanager/hooks/init/hook1.4/scripts/commit-email.pl
+pysvnmanager/hooks/init/hook1.4/scripts/commit-email.rb
+pysvnmanager/hooks/init/hook1.4/scripts/commit_log_check.py
+pysvnmanager/hooks/init/hook1.4/scripts/detect-merge-conflicts.sh
+pysvnmanager/hooks/init/hook1.4/scripts/log-police.py
+pysvnmanager/hooks/init/hook1.4/scripts/pre-commit-check.py
+pysvnmanager/hooks/init/hook1.4/scripts/pre-lock-require-needs-lock.py
+pysvnmanager/hooks/init/hook1.4/scripts/svn2rss.py
+pysvnmanager/hooks/init/hook1.4/scripts/svnperms.conf
+pysvnmanager/hooks/init/hook1.4/scripts/svnperms.conf.example
+pysvnmanager/hooks/init/hook1.4/scripts/svnperms.py
+pysvnmanager/hooks/init/hook1.4/scripts/verify-po.py
 pysvnmanager/hooks/init/hook1.5/parse_ini.sh
 pysvnmanager/hooks/init/hook1.5/post-commit
 pysvnmanager/hooks/init/hook1.5/post-lock.tmpl
@@ -63,6 +80,28 @@
 pysvnmanager/hooks/init/hook1.5/pre-revprop-change
 pysvnmanager/hooks/init/hook1.5/pre-unlock.tmpl
 pysvnmanager/hooks/init/hook1.5/start-commit
+pysvnmanager/hooks/init/hook1.5/scripts/README
+pysvnmanager/hooks/init/hook1.5/scripts/check-authz.py
+pysvnmanager/hooks/init/hook1.5/scripts/check-case-insensitive.pl
+pysvnmanager/hooks/init/hook1.5/scripts/check-case-insensitive.py
+pysvnmanager/hooks/init/hook1.5/scripts/check-mime-type.pl
+pysvnmanager/hooks/init/hook1.5/scripts/check-mime-type.py
+pysvnmanager/hooks/init/hook1.5/scripts/commit-access-control.cfg
+pysvnmanager/hooks/init/hook1.5/scripts/commit-access-control.cfg.example
+pysvnmanager/hooks/init/hook1.5/scripts/commit-access-control.pl
+pysvnmanager/hooks/init/hook1.5/scripts/commit-block-joke.py
+pysvnmanager/hooks/init/hook1.5/scripts/commit-email.pl
+pysvnmanager/hooks/init/hook1.5/scripts/commit-email.rb
+pysvnmanager/hooks/init/hook1.5/scripts/commit_log_check.py
+pysvnmanager/hooks/init/hook1.5/scripts/detect-merge-conflicts.sh
+pysvnmanager/hooks/init/hook1.5/scripts/log-police.py
+pysvnmanager/hooks/init/hook1.5/scripts/pre-commit-check.py
+pysvnmanager/hooks/init/hook1.5/scripts/pre-lock-require-needs-lock.py
+pysvnmanager/hooks/init/hook1.5/scripts/svn2rss.py
+pysvnmanager/hooks/init/hook1.5/scripts/svnperms.conf
+pysvnmanager/hooks/init/hook1.5/scripts/svnperms.conf.example
+pysvnmanager/hooks/init/hook1.5/scripts/svnperms.py
+pysvnmanager/hooks/init/hook1.5/scripts/verify-po.py
 pysvnmanager/hooks/plugins/AllowRevpropChange.py
 pysvnmanager/hooks/plugins/BugtrackMantis.py
 pysvnmanager/hooks/plugins/CapCheckMergeInfo.py

Modified: trunk/pysvnmanager/controllers/authz.py
===================================================================
--- trunk/pysvnmanager/controllers/authz.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/controllers/authz.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -192,7 +192,7 @@
                 self.authz.set_rules(reposname, path, rules);
             self.authz.save(revision, comment=log_message)
         except Exception, e:
-            msg = get_unicode(e.message)
+            msg = except_to_unicode(e)
 
         log.info(log_message)
         if msg: log.error(msg)
@@ -215,7 +215,7 @@
             self.authz.del_module(reposname, path);
             self.authz.save(revision, comment=log_message)
         except Exception, e:
-            msg = get_unicode(e.message)
+            msg = except_to_unicode(e)
         
         log.info(log_message)
         if msg: log.error(msg)

Modified: trunk/pysvnmanager/controllers/repos.py
===================================================================
--- trunk/pysvnmanager/controllers/repos.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/controllers/repos.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -117,7 +117,7 @@
             plugin.install(d)
         except Exception, e:
             result = "<div class='error'>" + _("Apply plugin '%(plugin)s' on '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
-                        "plugin": pluginname, "repos":reposname, "msg": e} + "</div>"
+                        "plugin": pluginname, "repos":reposname, "msg": except_to_unicode(e) } + "</div>"
         else:
             result = "<div class='info'>" + _("Apply plugin '%(plugin)s' on '%(repos)s' success.") % {
                         "plugin": pluginname, "repos":reposname} + "</div>"
@@ -141,7 +141,7 @@
                     log.info("my delete plugin %s, %s" % (pluginname, hookobj.plugins[pluginname].name))
             except Exception, e:
                 result = "<div class='error'>" + _("Delete plugin '%(plugin)s' on '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
-                        "plugin": ", ".join(plugin_list), "repos":reposname, "msg": e.message} + "</div>"
+                        "plugin": ", ".join(plugin_list), "repos":reposname, "msg": except_to_unicode(e) } + "</div>"
             else:
                 result = "<div class='info'>" + _("Delete plugin '%(plugin)s' on '%(repos)s' success.") % {
                         "plugin": ", ".join(plugin_list), "repos":reposname} + "</div>"
@@ -156,7 +156,7 @@
             self.repos.create(reposname)
         except Exception, e:
             result = "<div class='error'>" + _("Create repository '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
-                        "repos":reposname, "msg": e.message} + "</div>"
+                        "repos":reposname, "msg": except_to_unicode(e) } + "</div>"
         else:
             result = "<div class='info'>" + _("Create repository '%(repos)s' success.") % {"repos":reposname} + "</div>"
         return result
@@ -172,7 +172,7 @@
             self.repos.delete(reposname)
         except Exception, e:
             result = "<div class='error'>" + _("Delete repository '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
-                        "repos":reposname, "msg": e.message} + "</div>"
+                        "repos":reposname, "msg": except_to_unicode(e) } + "</div>"
         else:
             result = "<div class='info'>" + _("Delete blank repository '%(repos)s' success.") % {"repos":reposname} + "</div>"
         return result

Modified: trunk/pysvnmanager/controllers/role.py
===================================================================
--- trunk/pysvnmanager/controllers/role.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/controllers/role.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -107,7 +107,7 @@
             self.authz.set_group(rolename, member_list, autodrop=autodrop)
             self.authz.save(revision, comment=log_message)
         except Exception, e:
-            msg = get_unicode(e.message)
+            msg = except_to_unicode(e)
 
         log.info(log_message)
         if msg: log.error(msg)
@@ -128,7 +128,7 @@
                 self.authz.del_group(rolename)
                 self.authz.save(revision, comment=log_message)
             except Exception, e:
-                msg = get_unicode(e.message)
+                msg = except_to_unicode(e)
 
         log.info(log_message)
         if msg: log.error(msg)
@@ -149,7 +149,7 @@
             self.authz.add_alias(aliasname, username)
             self.authz.save(revision, comment=log_message)
         except Exception, e:
-            msg = get_unicode(e.message)
+            msg = except_to_unicode(e)
 
         log.info(log_message)
         if msg: log.error(msg)
@@ -170,7 +170,7 @@
                 self.authz.del_alias(aliasname)
                 self.authz.save(revision, comment=log_message)
             except Exception, e:
-                msg = get_unicode(e.message)
+                msg = except_to_unicode(e)
 
         log.info(log_message)
         if msg: log.error(msg)

Modified: trunk/pysvnmanager/hooks/plugins/ReadonlySvnMirror.py
===================================================================
--- trunk/pysvnmanager/hooks/plugins/ReadonlySvnMirror.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/hooks/plugins/ReadonlySvnMirror.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -112,7 +112,7 @@
             switch = 'no'
         admin = params.get('admin')
         if not admin:
-            raise Exception, _("Wrong configuration.")
+            raise Exception(_("Wrong configuration."))
         self.set_config(self.key_switch, switch)
         self.set_config(self.key_admin, admin)
         self.save()

Modified: trunk/pysvnmanager/lib/base.py
===================================================================
--- trunk/pysvnmanager/lib/base.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/lib/base.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -36,6 +36,14 @@
         msg = repr(msg)[1:-1]
     return msg
 
+def except_to_unicode(e):
+    msg = ', '.join(e.args)
+    return get_unicode(msg)
+
+def except_to_utf8(e):
+    msg = ', '.join(e.args)
+    return get_utf8(msg)
+
 class BaseController(WSGIController):
     requires_auth = []
 

Modified: trunk/pysvnmanager/websetup.py
===================================================================
--- trunk/pysvnmanager/websetup.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/pysvnmanager/websetup.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -22,6 +22,8 @@
         os.mkdir(here+'/config')
     if not os.path.exists(here+'/config/RCS'):
         os.mkdir(here+'/config/RCS')
+    if not os.path.exists(here+'/svnroot'):
+        os.mkdir(here+'/svnroot')
     filelist = ['svn.access', 'svn.passwd', 'localconfig.py']
     for f in filelist:
         src  = resource_filename('pysvnmanager', 'config/' + f+'.in')

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2008-08-28 11:15:39 UTC (rev 47)
+++ trunk/setup.py	2008-08-28 15:58:56 UTC (rev 48)
@@ -7,7 +7,7 @@
 
 setup(
     name='pySvnManager',
-    version="0.2.0",
+    version="0.2.1",
     description='SVN authz web management tools.',
     author='Jiang Xin',
     author_email='jia...@os...',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.