Repository :
http://git.fedorahosted.org/cgit/
On branch : master
---------------------------------------------------------------
commit 2dec3bcfc79f8004c92b180432938fd8bfaab59e
Author: Matt Domsch <matt(a)domsch.com>
Date: Fri Dec 13 00:16:29 2013 -0600
reduce TG-induced DeprecationWarnings
The import of the turbogears module throws a warning
/usr/lib/python2.6/site-packages/tw/core/view.py:223: DeprecationWarning:
object.__new__() takes no parameters
due to object.__new__ changing in Python 2.6.
This was annoying. So, shut it up, only in import
of turbogears.
---------------------------------------------------------------
server/crawler | 6 ++++--
server/crawler_perhost | 6 +++++-
server/generate-publiclist | 5 ++++-
server/generate-worldmap | 5 ++++-
server/import_centos | 5 ++++-
server/initialize-database | 5 ++++-
server/manage-repo-redirects | 5 ++++-
server/mirrormanager.wsgi | 6 ++++--
server/move-devel-to-release | 5 ++++-
server/move-to-archive | 5 ++++-
server/refresh_mirrorlist_cache | 5 ++++-
server/update-database-schema | 5 ++++-
server/update-master-directory-list | 5 ++++-
13 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/server/crawler b/server/crawler
index 3b2aacf..81e472b 100755
--- a/server/crawler
+++ b/server/crawler
@@ -12,8 +12,10 @@ import signal
from subprocess import Popen
import sys
import time
-
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
sys.path.append('/usr/share/mirrormanager/server')
from mirrormanager.model import Host
diff --git a/server/crawler_perhost b/server/crawler_perhost
index c470621..199e3e1 100755
--- a/server/crawler_perhost
+++ b/server/crawler_perhost
@@ -18,9 +18,13 @@ import socket
import time
from urlparse import urlsplit
import urlgrabber
+import warnings
from sqlobject import SQLObjectNotFound
-import turbogears
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
+
from turbogears import config
sys.path.append('/usr/share/mirrormanager/server')
from mirrormanager.model import Directory, Category, HostCategoryDir, Host, HostCategory
diff --git a/server/generate-publiclist b/server/generate-publiclist
index a965c35..b075fad 100755
--- a/server/generate-publiclist
+++ b/server/generate-publiclist
@@ -12,7 +12,10 @@ import optparse
import os
import sys
import time
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
import turbogears.util as tg_util
from turbogears import config
from turbogears.view import engines
diff --git a/server/generate-worldmap b/server/generate-worldmap
index 3fd9800..3a684e8 100755
--- a/server/generate-worldmap
+++ b/server/generate-worldmap
@@ -14,7 +14,10 @@ pkg_resources.require("TurboGears")
from sqlobject import *
import sys, os, string
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from mirrormanager.model import *
from optparse import OptionParser
import GeoIP
diff --git a/server/import_centos b/server/import_centos
index 265bb37..4f16d64 100755
--- a/server/import_centos
+++ b/server/import_centos
@@ -15,7 +15,10 @@ pkg_resources.require("TurboGears")
from sqlobject import *
import sys
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from mirrormanager.model import *
from mirrormanager.mirrorlist import name_to_ips
from optparse import OptionParser
diff --git a/server/initialize-database b/server/initialize-database
index 4acee12..7142486 100755
--- a/server/initialize-database
+++ b/server/initialize-database
@@ -6,7 +6,10 @@ __requires__ = 'TurboGears[future]'
import pkg_resources
pkg_resources.require("TurboGears")
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from turbogears.database import PackageHub
from mirrormanager.initial import user_group_setup, create_arches, setup_centos
diff --git a/server/manage-repo-redirects b/server/manage-repo-redirects
index 62d5032..c8507e4 100755
--- a/server/manage-repo-redirects
+++ b/server/manage-repo-redirects
@@ -11,7 +11,10 @@ pkg_resources.require("TurboGears")
from sqlobject import *
import sys
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from mirrormanager.model import *
from optparse import OptionParser
diff --git a/server/mirrormanager.wsgi b/server/mirrormanager.wsgi
index 7006c85..9236b5f 100755
--- a/server/mirrormanager.wsgi
+++ b/server/mirrormanager.wsgi
@@ -12,8 +12,10 @@ else:
import pkg_resources
pkg_resources.require("TurboGears<1.2")
pkg_resources.require("CherryPy<3.0")
-
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from turbogears import startup
import cherrypy
import cherrypy._cpwsgi
diff --git a/server/move-devel-to-release b/server/move-devel-to-release
index 5d2e8a0..8a63f1a 100755
--- a/server/move-devel-to-release
+++ b/server/move-devel-to-release
@@ -6,7 +6,10 @@ pkg_resources.require("TurboGears")
import sys, re, os
from optparse import OptionParser
from sqlobject import *
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
sys.path.append('/usr/share/mirrormanager/server')
from mirrormanager.model import Category, Directory, Version
diff --git a/server/move-to-archive b/server/move-to-archive
index 5c1c1cc..787ef33 100755
--- a/server/move-to-archive
+++ b/server/move-to-archive
@@ -4,7 +4,10 @@ import pkg_resources
pkg_resources.require("TurboGears")
from sqlobject import *
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from mirrormanager.model import *
from optparse import OptionParser
import sys, re
diff --git a/server/refresh_mirrorlist_cache b/server/refresh_mirrorlist_cache
index d81c0d8..4e00a43 100755
--- a/server/refresh_mirrorlist_cache
+++ b/server/refresh_mirrorlist_cache
@@ -5,7 +5,10 @@ pkg_resources.require("TurboGears")
import sys
import optparse
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from turbogears.database import PackageHub
sys.path.append('/usr/share/mirrormanager/server')
from mirrormanager.mirrorlist import populate_all_caches, dump_caches
diff --git a/server/update-database-schema b/server/update-database-schema
index d4fc053..fc3761d 100755
--- a/server/update-database-schema
+++ b/server/update-database-schema
@@ -4,7 +4,10 @@ import pkg_resources
pkg_resources.require("TurboGears")
import sys
-import turbogears
+import warnings
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from optparse import OptionParser
from turbogears.database import PackageHub
diff --git a/server/update-master-directory-list b/server/update-master-directory-list
index 48fd087..7c66ee5 100755
--- a/server/update-master-directory-list
+++ b/server/update-master-directory-list
@@ -15,9 +15,12 @@ import yum.repoMDObject
import datetime
import time
import hashlib
+import warnings
from sqlobject import *
-import turbogears
+with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
+ import turbogears
from turbogears import config
sys.path.append('/usr/share/mirrormanager/server')