Commits

Georg Brandl  committed 43d73e5

Allow server_names with and without trailing slashes.

  • Participants
  • Parent commits a7028e9

Comments (0)

Files changed (1)

File scripts/lodgeit.py

         open_browser=true/false
         encoding=fallback_charset
 
-    :authors: 2007-2008 Georg Brandl <georg@python.org>,
+    :authors: 2007-2010 Georg Brandl <georg@python.org>,
               2006 Armin Ronacher <armin.ronacher@active-4.com>,
               2006 Matt Good <matt@matt-good.net>,
               2005 Raphael Slinckx <raphael@slinckx.net>
     import xmlrpclib
     if _xmlrpc_service is None:
         try:
-            _xmlrpc_service = xmlrpclib.ServerProxy(_server_name + '/xmlrpc/',
+            _xmlrpc_service = xmlrpclib.ServerProxy(_server_name + 'xmlrpc/',
                                                     allow_none=True)
         except Exception, err:
             fail('Could not connect to Pastebin: %s' % err, -1)
 
     # The global available server name
     _server_name = opts.server_name
+    if not _server_name.endswith('/'):
+        _server_name += '/'
 
     # special modes of operation:
     # - paste script version