port python2 code to python3

Change-Id: I02309cdeca6c30e01c22373fb013857f1263e1b5
Signed-off-by: wangbiao <biao716.wang@samsung.com>

diff --git a/debian/control b/debian/control
index 3f65e8c5db55944cb0b25dd62beeb4418261bc86..90d94ce18c9e989913fd815f7f9044fd2a9b923f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: obs-service-git-buildpackage
 Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-Build-Depends: debhelper (>= 7.0.15), cdbs, python-dev, dh-python, python-docutils, python, python-setuptools, python-coverage, python-nose
+Build-Depends: debhelper (>= 7.0.15), cdbs, python3-dev, dh-python, python3-docutils, python3, python3-setuptools, python3-coverage, python3-nose
 Standards-Version: 0.9
 Homepage: http://www.tizen.org
 
 Package: obs-service-git-buildpackage
 Architecture: all
-Depends:  ${python:Depends},
+Depends:  ${python3:Depends},
  rpm,
- python-rpm,
- python-urlgrabber,
+ python3-rpm,
+ python3-urlgrabber,
  cpio,
  bzip2,
  git-buildpackage,
@@ -23,10 +23,10 @@ Description: image creator for Linux distributions
 
 Package: obs-service-git-buildpackage-utils
 Architecture: all
-Depends:  ${python:Depends},
+Depends:  ${python3:Depends},
  rpm,
- python,
- python-urlgrabber,
+ python3,
+ python3-urlgrabber,
  cpio,
  bzip2,
  gbp-repocache,
@@ -36,7 +36,7 @@ Description: image creator for Linux distributions
 
 Package: gbp-repocache
 Architecture: all
-Depends:  ${python:Depends},
+Depends:  ${python3:Depends},
 Description: image creator for Linux distributions
   The tool createrep is used to ppfarm test
 

diff --git a/debian/gbp-repocache.install b/debian/gbp-repocache.install
index 6791c38cee57992a63ae8dbe57df7a34eb216343..94cecbd6bf4ebd3c2e749ace67b9f9305681d0e7 100644 (file)
--- a/debian/gbp-repocache.install
+++ b/debian/gbp-repocache.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.7/site-packages/gbp_repocache /usr/lib/python2.7/site-packages/
-debian/tmp/usr/lib/python2.7/site-packages/repocache_adm /usr/lib/python2.7/site-packages/
+debian/tmp/usr/lib/python*/*-packages/gbp_repocache/*.py
+debian/tmp/usr/lib/python*/*-packages/repocache_adm/*.py

diff --git a/debian/obs-service-git-buildpackage-utils.install b/debian/obs-service-git-buildpackage-utils.install
index 6de8327570da64681f863adc0eca246621226e4c..dcce29bfed9df8eb6b75d6397481917a8e5d6688 100644 (file)
--- a/debian/obs-service-git-buildpackage-utils.install
+++ b/debian/obs-service-git-buildpackage-utils.install
@@ -1 +1 @@
-debian/tmp/usr/lib/python2.7/site-packages/obs_service_gbp_utils /usr/lib/python2.7/site-packages/
+/usr/lib/python*/*-packages/obs_service_gbp_utils/*.py

diff --git a/debian/obs-service-git-buildpackage.install b/debian/obs-service-git-buildpackage.install
index 1f37d6829b425731da3082c7b58c808ce3989a98..1826a57be38661d17ab01453c35e7f788f339ed8 100644 (file)
--- a/debian/obs-service-git-buildpackage.install
+++ b/debian/obs-service-git-buildpackage.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/obs/service/* /usr/lib/obs/service/
-debian/tmp/usr/lib/python2.7/site-packages/obs_service_gbp /usr/lib/python2.7/site-packages/
+usr/lib/obs/service/*
+usr/lib/python*/*-packages/obs_service_gbp/*.py

diff --git a/debian/rules b/debian/rules
index ee90d9406f85390efd8071bccf18fabfd5ba40b7..e3b5525456010589a5749e77b04145c5b04fdb46 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,52 +1,13 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-       python setup.py build
-       pwd
-       ls
+%:
+       dh $@ --with python3 --buildsystem=pybuild
        cp config/git-buildpackage  config/obs-service-git-buildpackage.example.config
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
+override_dh_auto_install:
+       python3 setup.py install --root=debian/tmp --prefix=/usr
 
-       # Installing package
-       mkdir -p $(CURDIR)/debian/tmp/
-       python setup.py install --skip-build --root=$(CURDIR)/debian/tmp --prefix=/usr
-       rm -rf $(CURDIR)/usr/lib/python2.7/site-packages/*info
-       ls -R
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_install
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_python2
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+override_dh_auto_test:
+       @echo 'Skipping autotests'
 
-binary-arch: build install
+override_dh_usrlocal:
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py
index a11a8695ffbe81354287320ff9207764f826835d..335ca46f7f8091a2a3a00d04c97b4637bb24be4e 100644 (file)
--- a/obs_service_gbp/command.py
+++ b/obs_service_gbp/command.py
@@ -23,7 +23,7 @@ import argparse
 import logging
 import shutil
 import tempfile
-from ConfigParser import SafeConfigParser
+from configparser import SafeConfigParser
 
 import gbp.log as gbplog
 from gbp.rpm import guess_spec, NoSpecError
@@ -112,7 +112,7 @@ def read_config(filenames=None):
         parser.add_section('general')
 
     # Read overrides from environment
-    for key in defaults.keys():
+    for key in list(defaults.keys()):
         envvar ='OBS_GIT_BUILDPACKAGE_%s' % key.replace('-', '_').upper()
         if envvar in os.environ:
             parser.set('general', key, os.environ[envvar])

diff --git a/repocache_adm/adm.py b/repocache_adm/adm.py
index 5d93815a37cf7b8e130bb154366b79cf90f8ded7..40e0516e09b2b948737eec98bd953ad3e7758f03 100755 (executable)
--- a/repocache_adm/adm.py
+++ b/repocache_adm/adm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4
 #
 # Copyright (C) 2013 Intel Corporation <markus.lehtonen@linux.intel.com>

diff --git a/repocache_adm/cmd_stat.py b/repocache_adm/cmd_stat.py
index e723bd90005f29852bd7e450d2c4971c0a236632..abbd07541b1691f72d5168d56fe69d035bdce90d 100644 (file)
--- a/repocache_adm/cmd_stat.py
+++ b/repocache_adm/cmd_stat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4
 #
 # Copyright (C) 2013 Intel Corporation <markus.lehtonen@linux.intel.com>
@@ -67,7 +67,7 @@ class Stat(SubcommandBase):
                     num_repos += 1
 
         pretty_sz = " (%s)" % pprint_sz(total_sz) if total_sz >= 1024 else ""
-        print "Status of %s:" % path
-        print "Total of %d repos taking %d bytes%s of disk space" % \
-                (num_repos, total_sz, pretty_sz)
+        print("Status of %s:" % path)
+        print("Total of %d repos taking %d bytes%s of disk space" % \
+                (num_repos, total_sz, pretty_sz))
         return 0

diff --git a/repocache_adm/common.py b/repocache_adm/common.py
index 197828b280e22a821bbac2ebbaaffe3c284b9939..82519663d0a943562378cf44a1bc27b4c8495bc3 100644 (file)
--- a/repocache_adm/common.py
+++ b/repocache_adm/common.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4
 #
 # Copyright (C) 2013 Intel Corporation <markus.lehtonen@linux.intel.com>

diff --git a/service/git-buildpackage b/service/git-buildpackage
index d2617b2b3b19637cc2393c8d05c41dcfa60165e3..598be405412f35489b48b6358982f6dc65cb6ebb 100755 (executable)
--- a/service/git-buildpackage
+++ b/service/git-buildpackage
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4
 #
 # Copyright (C) 2013 Intel Corporation <markus.lehtonen@linux.intel.com>

diff --git a/setup.py b/setup.py
index 1f16160d8ee3b88681223aa820d61adb71ffcc1c..0464b1c9691b642ed0e9611a683c462bdc409df4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4
 #
 # Copyright (C) 2013 Intel Corporation <markus.lehtonen@linux.intel.com>