Changeset 9726

Timestamp:

05/31/08 18:51:40 (3 months ago)

Author:

tomk

Message:

added prototype of BOSHClient class and script for usage example, removed import of common.gajim from transports_nb

Location:

branches/bosh_support/src/common/xmpp

Files:

• client_bosh.py (added)
• examples (added)
• examples/run_client_bosh.py (added)
• transports_nb.py (modified) (4 diffs)

branches/bosh_support/src/common/xmpp/transports_nb.py

@@ -34 +34 @@
 log = logging.getLogger('gajim.c.x.transports_nb')
 
-import common.gajim
+# I don't need to load gajim.py just because of few TLS variables, so I changed
+# :%s/common\.gajim\.DATA_DIR/\'\.\.\/data\'/c
+# :%s/common\.gajim\.MY_CACERTS/\'\%s\/\.gajim\/cacerts\.pem\' \% os\.environ\[\'HOME\'\]/c
+
+# To change it back do:
+# %s/\'\.\.\/data\'/common\.gajim\.DATA_DIR/c
+# :%s/\'\%s\/\.gajim\/cacerts\.pem\' \% os\.environ\[\'HOME\'\]/common\.gajim\.MY_CACERTS/c
+
+# import common.gajim
+
 
 USE_PYOPENSSL = False
@@ -763 +772 @@
                 tcpsock.ssl_errnum = 0
                 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback)
-                cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem')
+                cacerts = os.path.join('../data', 'other', 'cacerts.pem')
                 try:
                         tcpsock._sslContext.load_verify_locations(cacerts)
@@ -770 +779 @@
                                 os.path.abspath(cacerts))
                 # load users certs
-                if os.path.isfile(common.gajim.MY_CACERTS):
+                if os.path.isfile('%s/.gajim/cacerts.pem' % os.environ['HOME']):
                         store = tcpsock._sslContext.get_cert_store()
-                        f = open(common.gajim.MY_CACERTS)
+                        f = open('%s/.gajim/cacerts.pem' % os.environ['HOME'])
                         lines = f.readlines()
                         i = 0
@@ -787 +796 @@
                                         except OpenSSL.crypto.Error, exception_obj:
                                                 log.warning('Unable to load a certificate from file %s: %s' %\
-                                                        (common.gajim.MY_CACERTS, exception_obj.args[0][0][2]))
+                                                        ('%s/.gajim/cacerts.pem' % os.environ['HOME'], exception_obj.args[0][0][2]))
                                         except:
                                                 log.warning(
                                                         'Unknown error while loading certificate from file %s' % \
-                                                        common.gajim.MY_CACERTS)
+                                                        '%s/.gajim/cacerts.pem' % os.environ['HOME'])
                                         begin = -1
                                 i += 1