[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gump-commits
Subject:    svn commit: r1883938 - in /gump/branches/python3/python/gump/actor: mvnrepoproxy/proxycontrol.py not
From:       markt () apache ! org
Date:       2020-11-29 18:19:07
Message-ID: 20201129181907.ACC0517A67F () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: markt
Date: Sun Nov 29 18:19:07 2020
New Revision: 1883938

URL: http://svn.apache.org/viewvc?rev=1883938&view=rev
Log:
python3 fixes

Modified:
    gump/branches/python3/python/gump/actor/mvnrepoproxy/proxycontrol.py
    gump/branches/python3/python/gump/actor/notify/notifier.py
    gump/branches/python3/python/gump/actor/stats/mysql/statsdb.py

Modified: gump/branches/python3/python/gump/actor/mvnrepoproxy/proxycontrol.py
URL: http://svn.apache.org/viewvc/gump/branches/python3/python/gump/actor/mvnrepoproxy/proxycontrol.py?rev=1883938&r1=1883937&r2=1883938&view=diff
 ==============================================================================
--- gump/branches/python3/python/gump/actor/mvnrepoproxy/proxycontrol.py (original)
+++ gump/branches/python3/python/gump/actor/mvnrepoproxy/proxycontrol.py Sun Nov 29 \
18:19:07 2020 @@ -19,7 +19,7 @@ import os
 import os.path
 import tempfile
 import time
-import urllib
+import urllib.request, urllib.parse
 
 from gump import log
 from gump.core.model.output import OUTPUT_POM
@@ -97,8 +97,8 @@ class MvnRepositoryProxyController(Abstr
             self.saveLogAndStop()
 
     def publish(self, groupId, artifactId, fileName):
-        urllib.urlopen(self.proxyURL + 'addartifact',
-                       urllib.urlencode({'groupId': groupId,
+        urllib.request.urlopen(self.proxyURL + 'addartifact',
+                       urllib.parse.urlencode({'groupId': groupId,
                                          'artifactId': artifactId,
                                          'file': fileName}))
 
@@ -127,7 +127,7 @@ class MvnRepositoryProxyController(Abstr
             # Hang back for a bit while the proxy starts up
             for _pWait in range(10):
                 try:
-                    urllib.urlopen(self.proxyURL)
+                    urllib.request.urlopen(self.proxyURL)
                     # Not reached until urlopen succeeds
                     log.info('mvn Repository proxy started')
                     break
@@ -143,7 +143,7 @@ class MvnRepositoryProxyController(Abstr
 
         log.info('Storing proxyLog to xdocs-work ...')
         try:
-            proxyLogRequest = urllib.urlopen(self.proxyURL + proxyLogFileName)
+            proxyLogRequest = urllib.request.urlopen(self.proxyURL + \
proxyLogFileName)  proxyLogContent = proxyLogRequest.read()
             proxyLogRequest.close()
             # TODO xdocs-Documenter is hard-coded here
@@ -158,7 +158,7 @@ class MvnRepositoryProxyController(Abstr
 
         log.info('Stopping mvn repository proxy')
         try:
-            urllib.urlopen(self.proxyURL + 'stop', urllib.urlencode({}))
+            urllib.request.urlopen(self.proxyURL + 'stop', \
                urllib.parse.urlencode({}))
             # allow Java process to stop before the Python process terminates
             time.sleep(5)
         except:

Modified: gump/branches/python3/python/gump/actor/notify/notifier.py
URL: http://svn.apache.org/viewvc/gump/branches/python3/python/gump/actor/notify/notifier.py?rev=1883938&r1=1883937&r2=1883938&view=diff
 ==============================================================================
--- gump/branches/python3/python/gump/actor/notify/notifier.py (original)
+++ gump/branches/python3/python/gump/actor/notify/notifier.py Sun Nov 29 18:19:07 \
2020 @@ -272,7 +272,7 @@ The following %s notify%s should have be
         # Form the subject
         subject=self.workspace.prefix+	\
                 ': Module '+module.getName()+' '+	\
-                lower(stateDescription(module.getState()))
+                stateDescription(module.getState()).lower()
                     
         if notification.isWarning():
             subject += ', but with warnings.'
@@ -292,7 +292,7 @@ The following %s notify%s should have be
         # Form the subject
         subject=self.workspace.prefix+': Project '+ project.getName()	\
             + ' (in module ' + module.getName() + ') ' \
-            + lower(stateDescription(project.getState()))
+            + stateDescription(project.getState()).lower()
             
         if notification.isWarning():
             subject += ', but with warnings.'

Modified: gump/branches/python3/python/gump/actor/stats/mysql/statsdb.py
URL: http://svn.apache.org/viewvc/gump/branches/python3/python/gump/actor/stats/mysql/statsdb.py?rev=1883938&r1=1883937&r2=1883938&view=diff
 ==============================================================================
--- gump/branches/python3/python/gump/actor/stats/mysql/statsdb.py (original)
+++ gump/branches/python3/python/gump/actor/stats/mysql/statsdb.py Sun Nov 29 \
18:19:07 2020 @@ -249,7 +249,7 @@ class StatisticsDB:
                         #print "SET ATTR : " + `value` 
                         settings[column] = "'" +\
                             value.strftime('%Y-%m-%d %H:%M:%S') + "'"
-                    elif isinstance(value, types.StringTypes):
+                    elif isinstance(value, basestring):
                         settings[column] = "'" + str(value) + "'"
                     else:
                         settings[column] = str(value)


[prev in list] [next in list] [prev in thread] [next in thread]