[Python-modules-commits] r23729 - in packages/circuits/trunk/debian (2 files)
eriol-guest at users.alioth.debian.org
eriol-guest at users.alioth.debian.org
Tue Mar 19 02:07:46 UTC 2013
Date: Tuesday, March 19, 2013 @ 02:07:44
Author: eriol-guest
Revision: 23729
Refreshed debian/patches/03_force-localhost-as-host-name.patch
Modified:
packages/circuits/trunk/debian/changelog
packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch
Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog 2013-03-19 01:46:22 UTC (rev 23728)
+++ packages/circuits/trunk/debian/changelog 2013-03-19 02:07:44 UTC (rev 23729)
@@ -7,8 +7,10 @@
- Disable sphinxcontrib-googleanalytics as well as sphinxcontrib-bitbucket
because it's not packaged for Debian and it is used to track generated
html files with Google Analytics web service
+ * debian/patches/03_force-localhost-as-host-name.patch
+ - Refreshed
- -- Daniele Tricoli <eriol at mornie.org> Tue, 19 Mar 2013 01:11:44 +0100
+ -- Daniele Tricoli <eriol at mornie.org> Tue, 19 Mar 2013 03:06:16 +0100
circuits (2.0.1-1) unstable; urgency=low
Modified: packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch
===================================================================
--- packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch 2013-03-19 01:46:22 UTC (rev 23728)
+++ packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch 2013-03-19 02:07:44 UTC (rev 23729)
@@ -9,33 +9,35 @@
Forwarded: not-needed
--- a/tests/web/test_logger.py
+++ b/tests/web/test_logger.py
-@@ -1,11 +1,12 @@
+@@ -1,5 +1,6 @@
#!/usr/bin/env python
-
+
+import os
import sys
+
try:
- from StringIO import StringIO
+@@ -7,7 +8,7 @@
except ImportError:
- from io import StringIO
+ from io import StringIO # NOQA
+
-from socket import gaierror, gethostbyname, gethostname
+from socket import gaierror, gethostbyname
-
+
from circuits.web import Controller, Logger
- from circuits.web.loggers import formattime
-@@ -43,7 +44,7 @@
- format = logger.format
-
+
+@@ -44,7 +45,7 @@
+ s = logfile.read().strip()
+
try:
- address = gethostbyname(gethostname())
+ address = gethostbyname('localhost')
except gaierror:
address = "127.0.0.1"
-
-@@ -57,6 +58,12 @@
+
+@@ -58,6 +59,12 @@
d["f"] = ""
d["a"] = "Python-urllib/%s" % sys.version[:3]
-
+
+ try:
+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
+ del d['h']
@@ -43,21 +45,21 @@
+ pass
+
keys = list(d.keys())
-
+
for k in keys:
@@ -79,7 +86,7 @@
- format = logger.format
-
+ s = logobj.message
+
try:
- address = gethostbyname(gethostname())
+ address = gethostbyname('localhost')
except gaierror:
address = "127.0.0.1"
-
+
@@ -93,6 +100,12 @@
d["f"] = ""
d["a"] = "Python-urllib/%s" % sys.version[:3]
-
+
+ try:
+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
+ del d['h']
@@ -65,21 +67,21 @@
+ pass
+
keys = list(d.keys())
-
+
for k in keys:
-@@ -117,7 +130,7 @@
- format = logger.format
-
+@@ -116,7 +129,7 @@
+ s = logfile.read().strip()
+
try:
- address = gethostbyname(gethostname())
+ address = gethostbyname('localhost')
except gaierror:
address = "127.0.0.1"
-
-@@ -131,6 +144,12 @@
+
+@@ -130,6 +143,12 @@
d["f"] = ""
d["a"] = "Python-urllib/%s" % sys.version[:3]
-
+
+ try:
+ if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
+ del d['h']
@@ -87,5 +89,5 @@
+ pass
+
keys = list(d.keys())
-
+
for k in keys:
More information about the Python-modules-commits
mailing list