November 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libzypp for openSUSE:13.2:Update
by root＠hilbert.suse.de 03 Nov '15

03 Nov '15

Hello community, here is the log from the commit of package libzypp for openSUSE:13.2:Update checked in at 2015-11-03 10:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/libzypp (Old) and /work/SRC/openSUSE:13.2:Update/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.pl2gtb/_old 2015-11-03 10:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.pl2gtb/_new 2015-11-03 10:20:01.000000000 +0100 @@ -1 +1 @@ -<link package='libzypp.3856' cicount='copy' /> +<link package='libzypp.3948' cicount='copy' />

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2015-11-02 12:55:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2015-10-30 16:36:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2015-11-02 12:55:57.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Oct 30 13:46:11 UTC 2015 - meissner(a)suse.com + +- Updated to 1.7.54 development snapshot + - Implementation of the TransmitFile function. + - More implementation of the Web Services DLL. + - Improved video decoding. + - Alternative for the deprecated prelink tool. + - Major Turkish translation update. + - Various bug fixes. +- wine-relocate-base.patch: is upstream +- winetricks: updated + +------------------------------------------------------------------- Old: ---- wine-1.7.53.tar.bz2 wine-1.7.53.tar.bz2.sign wine-relocate-base.patch New: ---- wine-1.7.54.tar.bz2 wine-1.7.54.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.RrtsDM/_old 2015-11-02 12:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.RrtsDM/_new 2015-11-02 12:55:59.000000000 +0100 @@ -52,7 +52,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.53 +Version: 1.7.54 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ @@ -72,7 +72,6 @@ # SUSE specific patches # - currently none, but add them here #Patch0: susepatches.patch -Patch1: wine-relocate-base.patch Recommends: wine-gecko >= 2.24 Recommends: wine-mp3 # not packaged in distro... @@ -118,7 +117,6 @@ %prep %setup -q #%patch0 -p1 -%patch1 -p1 # cp %{S:3} . # @@ -174,7 +172,9 @@ install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/ mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr +%ifnarch x86_64 mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl +%endif install -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/ tar xjf %{SOURCE5} @@ -238,12 +238,16 @@ %{_bindir}/wisotool %{_datadir}/wine %{_datadir}/applications/wine.desktop +%ifnarch x86_64 %doc %{_mandir}/man1/wine.1* +%endif %doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/wineserver.1* +%ifnarch x86_64 %doc %dir %doc %{_mandir}/pl %doc %dir %doc %{_mandir}/pl/man1 %doc %{_mandir}/*/man1/wine.1* +%endif %doc %{_mandir}/*/man1/wineserver.1* %doc %{_mandir}/man1/msiexec.1.* %doc %{_mandir}/man1/notepad.1.* ++++++ wine-1.7.53.tar.bz2 -> wine-1.7.54.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.53.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.54.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.RrtsDM/_old 2015-11-02 12:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.RrtsDM/_new 2015-11-02 12:55:59.000000000 +0100 @@ -8020,6 +8020,29 @@ else w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q fi + + case "$W_ARCH" in + win64) + # Also install the 64 bit version + # 2015/10/19: 1a5d93dddbc431ab27b1da711cd3370891542797 + w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B79… 1a5d93dddbc431ab27b1da711cd3370891542797 + if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls" + then + rm -f "$W_TMP"/* # Avoid permission error + w_try_cabextract --directory="$W_TMP" vcredist_x64.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/a2" + w_try_cabextract --directory="$W_TMP" "$W_TMP/a3" + cp "$W_TMP"/F_CENTRAL_atl110_x64 "$W_SYSTEM64_DLLS"/atl110.dll + cp "$W_TMP"/F_CENTRAL_mfc110_x64 "$W_SYSTEM64_DLLS"/mfc110.dll + cp "$W_TMP"/F_CENTRAL_mfc110u_x64 "$W_SYSTEM64_DLLS"/mfc110u.dll + cp "$W_TMP"/F_CENTRAL_msvcp110_x64 "$W_SYSTEM64_DLLS"/msvcp110.dll + cp "$W_TMP"/F_CENTRAL_msvcr110_x64 "$W_SYSTEM64_DLLS"/msvcr110.dll + cp "$W_TMP"/F_CENTRAL_vcomp110_x64 "$W_SYSTEM64_DLLS"/vcomp110.dll + else + w_try "$WINE" vcredist_x64.exe $W_UNATTENDED_SLASH_Q + fi + ;; + esac } #---------------------------------------------------------------- @@ -8054,6 +8077,28 @@ else w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q fi + + case "$W_ARCH" in + win64) + # Also install the 64 bit version + # 2015/10/19: 8bf41ba9eef02d30635a10433817dbb6886da5a2 + w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD… 8bf41ba9eef02d30635a10433817dbb6886da5a2 + if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls" + then + rm -f "$W_TMP"/* # Avoid permission error + w_try_cabextract --directory="$W_TMP" vcredist_x64.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/a2" + w_try_cabextract --directory="$W_TMP" "$W_TMP/a3" + cp "$W_TMP"/F_CENTRAL_mfc120_x64 "$W_SYSTEM64_DLLS"/mfc120.dll + cp "$W_TMP"/F_CENTRAL_mfc120u_x64 "$W_SYSTEM64_DLLS"/mfc120u.dll + cp "$W_TMP"/F_CENTRAL_msvcp120_x64 "$W_SYSTEM64_DLLS"/msvcp120.dll + cp "$W_TMP"/F_CENTRAL_msvcr120_x64 "$W_SYSTEM64_DLLS"/msvcr120.dll + cp "$W_TMP"/F_CENTRAL_vcomp120_x64 "$W_SYSTEM64_DLLS"/vcomp120.dll + else + w_try "$WINE" vcredist_x64.exe $W_UNATTENDED_SLASH_Q + fi + ;; + esac } #---------------------------------------------------------------- @@ -8100,6 +8145,7 @@ w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B28… 3155cb0f146b927fcc30647c1a904cd162548c8c if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls" then + rm -f "$W_TMP"/* # Avoid permission error w_try_cabextract --directory="$W_TMP" vc_redist.x64.exe w_try_cabextract --directory="$W_TMP" "$W_TMP/a10" w_try_cabextract --directory="$W_TMP" "$W_TMP/a11" @@ -8945,7 +8991,7 @@ # SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception # and WINEDEBUG=+relay,+seh shows an exception very quickly after # Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091 - if xlsfonts 2>/dev/null | egrep -i "samyak|oriya" + if xlsfonts 2>/dev/null | egrep -i "samyak.*oriya" then w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again. That font causes strange crashes in .net programs." fi

1 0

commit ghc-cabal-helper for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package ghc-cabal-helper for openSUSE:Factory checked in at 2015-11-02 12:55:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cabal-helper (Old) and /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cabal-helper" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cabal-helper/ghc-cabal-helper.changes 2015-09-30 05:53:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new/ghc-cabal-helper.changes 2015-11-02 12:55:56.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 2 07:56:57 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.6.1.0 + +------------------------------------------------------------------- Old: ---- cabal-helper-0.6.0.0.tar.gz New: ---- cabal-helper-0.6.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cabal-helper.spec ++++++ --- /var/tmp/diff_new_pack.SBmvwI/_old 2015-11-02 12:55:56.000000000 +0100 +++ /var/tmp/diff_new_pack.SBmvwI/_new 2015-11-02 12:55:56.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name cabal-helper %bcond_with tests Name: ghc-cabal-helper -Version: 0.6.0.0 +Version: 0.6.1.0 Release: 0 Summary: Simple interface to some of Cabal's configuration state used by ghc-mod License: AGPL-3.0+ ++++++ cabal-helper-0.6.0.0.tar.gz -> cabal-helper-0.6.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/CabalHelper/Common.hs new/cabal-helper-0.6.1.0/CabalHelper/Common.hs --- old/cabal-helper-0.6.0.0/CabalHelper/Common.hs 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/CabalHelper/Common.hs 2015-10-05 17:36:12.000000000 +0200 @@ -86,3 +86,12 @@ appDataDir :: IO FilePath appDataDir = (</> "cabal-helper") <$> getAppUserDataDirectory "ghc-mod" + +isCabalFile :: FilePath -> Bool +isCabalFile f = takeExtension' f == ".cabal" + +takeExtension' :: FilePath -> String +takeExtension' p = + if takeFileName p == takeExtension p + then "" -- just ".cabal" is not a valid cabal file + else takeExtension p diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/CabalHelper/Main.hs new/cabal-helper-0.6.1.0/CabalHelper/Main.hs --- old/cabal-helper-0.6.0.0/CabalHelper/Main.hs 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/CabalHelper/Main.hs 2015-10-05 17:36:12.000000000 +0200 @@ -19,8 +19,12 @@ import Distribution.Simple.Utils (cabalVersion) import Distribution.Simple.Configure -import Distribution.Package (PackageIdentifier, InstalledPackageId, PackageId) +import Distribution.Package (PackageIdentifier, InstalledPackageId, PackageId, + packageName, packageVersion) import Distribution.PackageDescription (PackageDescription, + GenericPackageDescription(..), + Flag(..), + FlagName(..), FlagAssignment, Executable(..), Library(..), @@ -65,9 +69,11 @@ #endif import Control.Applicative ((<$>)) +import Control.Arrow (first, (&&&)) import Control.Monad import Control.Exception (catch, PatternMatchFail(..)) import Data.List +import qualified Data.Map as Map import Data.Maybe import Data.Monoid import Data.IORef @@ -92,6 +98,10 @@ ++"PROJ_DIR DIST_DIR [--with-* ...] (\n" ++" version\n" ++" | print-lbi [--human]\n" + ++" | package-id\n" + ++" | flags\n" + ++" | config-flags\n" + ++" | non-default-config-flags\n" ++" | write-autogen-files\n" ++" | compiler-version\n" ++" | ghc-options [--with-inplace]\n" @@ -107,6 +117,10 @@ commands :: [String] commands = [ "print-bli" + , "package-id" + , "flags" + , "config-flags" + , "non-default-config-flags" , "write-autogen-files" , "compiler-version" , "ghc-options" @@ -131,8 +145,11 @@ errMsg $ "distdir '"++distdir++"' does not exist" exitFailure + [cfile] <- filter isCabalFile <$> getDirectoryContents projdir + v <- maybe silent (const deafening) . lookup "GHC_MOD_DEBUG" <$> getEnvironment lbi <- unsafeInterleaveIO $ getPersistBuildConfig distdir + gpd <- unsafeInterleaveIO $ readPackageDescription v (projdir </> cfile) let pd = localPkgDescr lbi let lvd = (lbi, v, distdir) @@ -162,6 +179,26 @@ print =<< flip mapM cmds $$ \cmd -> do case cmd of + "flags":[] -> do + return $ Just $ ChResponseFlags $ sort $ + map (flagName' &&& flagDefault) $ genPackageFlags gpd + + "config-flags":[] -> do + return $ Just $ ChResponseFlags $ sort $ + map (first unFlagName') $ configConfigurationsFlags $ configFlags lbi + + "non-default-config-flags":[] -> do + let flagDefinitons = genPackageFlags gpd + flagAssgnments = configConfigurationsFlags $ configFlags lbi + nonDefaultFlags = + [ (fn, v) + | MkFlag {flagName=FlagName fn, flagDefault=dv} <- flagDefinitons + , (FlagName fn', v) <- flagAssgnments + , fn == fn' + , v /= dv + ] + return $ Just $ ChResponseFlags $ sort nonDefaultFlags + "write-autogen-files":[] -> do -- calls writeAutogenFiles initialBuildSteps distdir pd lbi v @@ -256,6 +293,8 @@ _ -> errMsg "Invalid usage!" >> usage >> exitFailure +flagName' = unFlagName' . flagName +unFlagName' (FlagName n) = n getLibrary :: PackageDescription -> Library getLibrary pd = unsafePerformIO $ do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/CabalHelper/Types.hs new/cabal-helper-0.6.1.0/CabalHelper/Types.hs --- old/cabal-helper-0.6.0.0/CabalHelper/Types.hs 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/CabalHelper/Types.hs 2015-10-05 17:36:12.000000000 +0200 @@ -35,9 +35,10 @@ | ChResponseEntrypoints [(ChComponentName, ChEntrypoint)] | ChResponseList [String] | ChResponsePkgDbs [ChPkgDb] - | ChResponseLbi String - | ChResponseVersion String Version + | ChResponseLbi String + | ChResponseVersion String Version | ChResponseLicenses [(String, [(String, Version)])] + | ChResponseFlags [(String, Bool)] deriving (Eq, Ord, Read, Show, Generic) data ChEntrypoint = ChSetupEntrypoint -- ^ Almost like 'ChExeEntrypoint' but diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/CabalHelper/Wrapper.hs new/cabal-helper-0.6.1.0/CabalHelper/Wrapper.hs --- old/cabal-helper-0.6.0.0/CabalHelper/Wrapper.hs 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/CabalHelper/Wrapper.hs 2015-10-05 17:36:12.000000000 +0200 @@ -35,6 +35,9 @@ import Distribution.System (buildPlatform) import Distribution.Text (display) +import Distribution.Verbosity (silent, deafening) +import Distribution.PackageDescription.Parse (readPackageDescription) +import Distribution.Package (packageName, packageVersion) import Paths_cabal_helper (version) import CabalHelper.Common @@ -56,7 +59,7 @@ \ [--with-cabal=CABAL_PATH]\n\ \ [--with-cabal-version=VERSION]\n\ \ [--with-cabal-pkg-db=PKG_DB]\n\ -\ PROJ_DIR DIST_DIR ( print-exe | [CABAL_HELPER_ARGS...] ) )\n" +\ PROJ_DIR DIST_DIR ( print-exe | package-id | [CABAL_HELPER_ARGS...] ) )\n" globalArgSpec :: [OptDescr (Options -> Options)] globalArgSpec = @@ -116,6 +119,15 @@ "version":[] -> putStrLn $ showVersion version "print-appdatadir":[] -> putStrLn =<< appDataDir "print-build-platform":[] -> putStrLn $ display buildPlatform + + projdir:_distdir:"package-id":[] -> do + v <- maybe silent (const deafening) . lookup "GHC_MOD_DEBUG" <$> getEnvironment + -- ghc-mod will catch multiple cabal files existing before we get here + [cfile] <- filter isCabalFile <$> getDirectoryContents projdir + gpd <- readPackageDescription v (projdir </> cfile) + putStrLn $ show $ + [Just $ ChResponseVersion (display (packageName gpd)) (packageVersion gpd)] + projdir:distdir:args' -> do cfgf <- canonicalizePath (distdir </> "setup-config") mhdr <- getCabalConfigHeader cfgf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/Distribution/Helper.hs new/cabal-helper-0.6.1.0/Distribution/Helper.hs --- old/cabal-helper-0.6.0.0/Distribution/Helper.hs 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/Distribution/Helper.hs 2015-10-05 17:36:12.000000000 +0200 @@ -44,6 +44,10 @@ , ghcMergedPkgOptions , ghcLangOptions , pkgLicenses + , flags + , configFlags + , nonDefaultConfigFlags + , packageId -- * Result types , ChModuleName(..) @@ -147,7 +151,10 @@ slbiGhcPkgOptions :: [(ChComponentName, [String])], slbiGhcMergedPkgOptions :: [String], slbiGhcLangOptions :: [(ChComponentName, [String])], - slbiPkgLicenses :: [(String, [(String, Version)])] + slbiPkgLicenses :: [(String, [(String, Version)])], + slbiFlags :: [(String, Bool)], + slbiConfigFlags :: [(String, Bool)], + slbiNonDefaultConfigFlags :: [(String, Bool)] } deriving (Eq, Ord, Read, Show) -- | Caches helper executable result so it doesn't have to be run more than once @@ -212,6 +219,21 @@ -- | Get the licenses of the packages the current project is linking against. pkgLicenses :: MonadIO m => Query m [(String, [(String, Version)])] +-- | Flag definitions from cabal file +flags :: MonadIO m => Query m [(String, Bool)] + +-- | Flag assignments from setup-config +configFlags :: MonadIO m => Query m [(String, Bool)] + +-- | Flag assignments from setup-config which differ from the default +-- setting. This can also include flags which cabal decided to modify, +-- i.e. don't rely on these being the flags set by the user directly. +nonDefaultConfigFlags :: MonadIO m => Query m [(String, Bool)] + +-- | Package identifier, i.e. package name and version +packageId :: MonadIO m => Query m (String, Version) + + packageDbStack = Query $ slbiPackageDbStack `liftM` getSlbi entrypoints = Query $ slbiEntrypoints `liftM` getSlbi sourceDirs = Query $ slbiSourceDirs `liftM` getSlbi @@ -221,6 +243,10 @@ ghcMergedPkgOptions = Query $ slbiGhcMergedPkgOptions `liftM` getSlbi ghcLangOptions = Query $ slbiGhcLangOptions `liftM` getSlbi pkgLicenses = Query $ slbiPkgLicenses `liftM` getSlbi +flags = Query $ slbiFlags `liftM` getSlbi +configFlags = Query $ slbiConfigFlags `liftM` getSlbi +nonDefaultConfigFlags = Query $ slbiNonDefaultConfigFlags `liftM` getSlbi +packageId = Query $ getPackageId -- | Run @cabal configure@ reconfigure :: MonadIO m @@ -240,8 +266,10 @@ _ <- liftIO $ readProc (cabalProgram progs) ("configure":progOpts) "" return () -getSomeConfigState :: MonadQuery m => m SomeLocalBuildInfo -getSomeConfigState = ask >>= \QueryEnv {..} -> do + + +invokeHelper :: MonadQuery m => [String] -> m [Maybe ChResponse] +invokeHelper args = ask >>= \QueryEnv {..} -> do let progs = qePrograms projdir = qeProjectDir distdir = qeDistDir @@ -251,25 +279,37 @@ , "--with-cabal=" ++ cabalProgram progs ] - args = [ "package-db-stack" - , "entrypoints" - , "source-dirs" - , "ghc-options" - , "ghc-src-options" - , "ghc-pkg-options" - , "ghc-merged-pkg-options" - , "ghc-lang-options" - , "licenses" - ] - - res <- liftIO $ do + liftIO $ do exe <- findLibexecExe "cabal-helper-wrapper" - out <- qeReadProcess exe (progArgs ++ projdir:distdir:args) "" + let args' = progArgs ++ projdir:distdir:args + out <- qeReadProcess exe args' "" evaluate (read out) `E.catch` \(SomeException _) -> - error $ concat ["getSomeConfigState", ": ", exe, " " - , intercalate " " (map show $ progArgs ++ projdir:distdir:args) - , " (read failed)"] + error $ concat ["invokeHelper", ": ", exe, " " + , intercalate " " (map show args') + , " (read failed)" + ] + +getPackageId :: MonadQuery m => m (String, Version) +getPackageId = ask >>= \QueryEnv {..} -> do + [ Just (ChResponseVersion pkgName pkgVer) ] <- invokeHelper [ "package-id" ] + return (pkgName, pkgVer) + +getSomeConfigState :: MonadQuery m => m SomeLocalBuildInfo +getSomeConfigState = ask >>= \QueryEnv {..} -> do + res <- invokeHelper [ "package-db-stack" + , "entrypoints" + , "source-dirs" + , "ghc-options" + , "ghc-src-options" + , "ghc-pkg-options" + , "ghc-merged-pkg-options" + , "ghc-lang-options" + , "licenses" + , "flags" + , "config-flags" + , "non-default-config-flags" + ] let [ Just (ChResponsePkgDbs pkgDbs), Just (ChResponseEntrypoints eps), Just (ChResponseCompList srcDirs), @@ -278,11 +318,14 @@ Just (ChResponseCompList ghcPkgOpts), Just (ChResponseList ghcMergedPkgOpts), Just (ChResponseCompList ghcLangOpts), - Just (ChResponseLicenses pkgLics) + Just (ChResponseLicenses pkgLics), + Just (ChResponseFlags fls), + Just (ChResponseFlags cfls), + Just (ChResponseFlags ndcfls) ] = res return $ SomeLocalBuildInfo - pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics + pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics fls cfls ndcfls -- | Make sure the appropriate helper executable for the given project is -- installed and ready to run queries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.0.0/cabal-helper.cabal new/cabal-helper-0.6.1.0/cabal-helper.cabal --- old/cabal-helper-0.6.0.0/cabal-helper.cabal 2015-09-07 08:02:26.000000000 +0200 +++ new/cabal-helper-0.6.1.0/cabal-helper.cabal 2015-10-05 17:36:12.000000000 +0200 @@ -1,5 +1,5 @@ name: cabal-helper -version: 0.6.0.0 +version: 0.6.1.0 synopsis: Simple interface to some of Cabal's configuration state used by ghc-mod description: @cabal-helper@ provides a library which wraps the internal use of

1 0

commit yast2-geo-cluster for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package yast2-geo-cluster for openSUSE:Factory checked in at 2015-11-02 12:55:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-geo-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-geo-cluster" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-geo-cluster/yast2-geo-cluster.changes 2015-08-13 18:11:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new/yast2-geo-cluster.changes 2015-11-02 12:55:55.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 07:37:43 UTC 2015 - nwang(a)suse.com + +- BNC#952225. Polish the doc for Authentication Configuration. +- Version 3.1.11 + +------------------------------------------------------------------- @@ -4 +10 @@ -- BNC#319318. Support authentification. +- Fate#319318. Support authentification. Old: ---- yast2-geo-cluster-3.1.10.tar.bz2 New: ---- yast2-geo-cluster-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-geo-cluster.spec ++++++ --- /var/tmp/diff_new_pack.Hg79M0/_old 2015-11-02 12:55:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Hg79M0/_new 2015-11-02 12:55:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.10 +Version: 3.1.11 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services ++++++ yast2-geo-cluster-3.1.10.tar.bz2 -> yast2-geo-cluster-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.changes new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.changes --- old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.changes 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.changes 2015-11-02 09:00:28.000000000 +0100 @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Mon Nov 2 07:37:43 UTC 2015 - nwang(a)suse.com + +- BNC#952225. Polish the doc for Authentication Configuration. +- Version 3.1.11 + +------------------------------------------------------------------- Thu Aug 13 02:10:41 UTC 2015 - nwang(a)suse.com -- BNC#319318. Support authentification. +- Fate#319318. Support authentification. - Version 3.1.10 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.spec new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.spec --- old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.spec 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.spec 2015-11-02 09:00:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.10 +Version: 3.1.11 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/dialogs.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/dialogs.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/dialogs.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/dialogs.rb 2015-11-02 09:00:28.000000000 +0100 @@ -103,7 +103,7 @@ VBox( Right( HBox( - PushButton(Id(:authentification), _("Authentification")), + PushButton(Id(:authentication), _("Authentication")), HSpacing(2), PushButton(Id(:cancel_inner), _("Ca&ncel")), PushButton(Id(:ok), _("OK")) @@ -113,7 +113,7 @@ ) end - def authentification_layout(authfile) + def authentication_layout(authfile) VBox( VSpacing(1), CheckBoxFrame( @@ -125,25 +125,30 @@ InputField( Id(:authfilename), Opt(:hstretch), - _("Authentification file"), + _("Authentication file"), authfile ), - Label( + Left(Label( _( - "A relative path will be saved in /etc/booth, or using absolute path directly." + "The file will be written to /etc/booth." ) - ), - Label( + )), + Left(Label( + _( + "To write it to a different directory, enter an absolute path." + ) + )), + Left(Label( _( "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." ) - ), - Label( + )), + Left(Label( _( - "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually." + "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually." ) - ), - PushButton(Id(:genf), Opt(:notify), _("Generate Authentification Key File")) + )), + PushButton(Id(:genf), Opt(:notify), _("Generate Authentication Key File")) ) ), VStretch(), @@ -638,9 +643,9 @@ next end - if ret == :authentification || ret == :ok && cur_page == :basic - #Validation check before switch to authentification - #Still fall to :authentification or :ok + if ret == :authentication || ret == :ok && cur_page == :basic + #Validation check before switch to authentication + #Still fall to :authentication or :ok conf = UI.QueryWidget(:confname, :Value).to_s if conf == "" Popup.Message(_("Configuration name can not be empty.")) @@ -681,13 +686,13 @@ end end - if ret == :authentification - cur_page = :authentification + if ret == :authentication + cur_page = :authentication Wizard.SetContents( - Ops.get_string(@NAME, "authentification_conf", ""), - authentification_layout(authfile), - Ops.get_string(@HELPS, "authentification", ""), + Ops.get_string(@NAME, "authentication_conf", ""), + authentication_layout(authfile), + Ops.get_string(@HELPS, "authentication", ""), false, false ) @@ -698,7 +703,7 @@ end end - if ret == :basic || ret == :ok && cur_page == :authentification + if ret == :basic || ret == :ok && cur_page == :authentication #Validation check before switch to basic #Still fall to :basic or :ok if UI.QueryWidget(Id(:secauth), :Value) @@ -730,10 +735,10 @@ path(".target.bash"), "/usr/sbin/booth-keygen " + temp_authfile ) != 0 - Popup.Message(_("Failed to create authentification file ") + temp_authfile + + Popup.Message(_("Failed to create authentication file ") + temp_authfile + "\nNeed to check the directory and remove the exist key file.") else - Popup.Message(_("Succeed to created authentification file ") + temp_authfile) + Popup.Message(_("Succeed to created authentication file ") + temp_authfile) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/helps.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/helps.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/helps.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/helps.rb 2015-11-02 09:00:28.000000000 +0100 @@ -35,15 +35,16 @@ "confs" => "<p><b>configure files</b><br> \n" + "Geo cluster support Multi confs, like /etc/booth/*.conf \n" + "<p>", - "authentification" => "<p><b>Authentification configuration</b><br> \n" + + "authentication" => "<p><b>Authentication configuration</b><br> \n" + "<b>Enable Security Auth</b><br>\n" + - "Enable/disable authentification of geo cluster of one conf.</p>" + - "<p><b>Authentification file</b><br>\n" + - "A relative path will be saved in /etc/booth, or using absolute path directly.</p>" + - "<p><b>Generate Authentification Key File</b><br>\n" + - "Auto generate authentification file. The key must be between 8 and 64 characters long and" + + "Enable/disable authentication of geo cluster of one conf.</p>" + + "<p><b>Authentication file</b><br>\n" + + "The file will be written to /etc/booth. To write it to a different directory, enter an absolute path.\n" + + "To join an existing geo cluster, please copy /etc/booth/<key> from other nodes manually.</p>" + + "<p><b>Generate Authentication Key File</b><br>\n" + + "Auto generate authentication file. The key must be between 8 and 64 characters long and" + "be readable only by the file owner. Save as /etc/booth/*.key is recommended.\n" + - "Need to sync generated authentification file to all nodes manually or via csync2." + + "Need to sync generated authentication file to all nodes manually or via csync2." + "Generation may fail when file already exist or directory not exist!" + "</p>", "booth" => "<p><b>transport</b><br> \n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/wizards.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/wizards.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/wizards.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/wizards.rb 2015-11-02 09:00:28.000000000 +0100 @@ -44,7 +44,7 @@ @NAME = { "choose_conf" => _("Geo Cluster Configuration"), - "authentification_conf" => _("Authentification Configuration"), + "authentication_conf" => _("Authentication Configuration"), "firewall" => _("Firewall Configuration"), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/modules/GeoCluster.rb new/yast2-geo-cluster-3.1.11/src/modules/GeoCluster.rb --- old/yast2-geo-cluster-3.1.10/src/modules/GeoCluster.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/modules/GeoCluster.rb 2015-11-02 09:00:28.000000000 +0100 @@ -74,7 +74,7 @@ # Read all geo-cluster settings # @return true on success @global_files = {} - # Empty "authfile" means disable authentification + # Empty "authfile" means disable authentication @global_conf_single = { "transport" => "UDP", "port" => "9929", "authfile" => "" } @global_conf_list = [ "arbitrator", "site" ] @global_conf_ticket = { "expire" => "", "acquire-after" => "", "timeout" => "", "retries" => "", "weights" => "", "before-acquire-handler" => ""}

1 0

commit python3-amqp for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-amqp for openSUSE:Factory checked in at 2015-11-02 12:55:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-amqp (Old) and /work/SRC/openSUSE:Factory/.python3-amqp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-amqp" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-amqp/python3-amqp.changes 2015-01-20 12:38:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-amqp.new/python3-amqp.changes 2015-11-02 12:55:53.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Nov 1 18:19:39 UTC 2015 - arun(a)gmx.de + +- specfile + * added mock package for tests + +- update to version 1.4.7: + * Fixed libSystem error on OS X 10.11 (El Capitan) + Fix contributed by Eric Wang. + * "channel.basic_publish" now raises + :exc:`amqp.exceptions.NotConfirmed` on "basic.nack". + * AMQP timestamps received are now converted from GMT instead of + local time (Issue #67). + * Wheel package installation now supported by both Python 2 and + Python3. Fix contributed by Rémy Greinhofer. + +------------------------------------------------------------------- Old: ---- amqp-1.4.6.tar.gz New: ---- amqp-1.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-amqp.spec ++++++ --- /var/tmp/diff_new_pack.noUkZP/_old 2015-11-02 12:55:53.000000000 +0100 +++ /var/tmp/diff_new_pack.noUkZP/_new 2015-11-02 12:55:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-amqp # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-amqp -Version: 1.4.6 +Version: 1.4.7 Release: 0 Summary: Low-level AMQP client for Python (fork of amqplib) License: LGPL-2.1 @@ -30,6 +30,7 @@ BuildRequires: python3-Sphinx BuildRequires: python3-sphinxcontrib-issuetracker # Test requirements: +BuildRequires: python3-mock BuildRequires: python3-nose BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ amqp-1.4.6.tar.gz -> amqp-1.4.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/Changelog new/amqp-1.4.7/Changelog --- old/amqp-1.4.6/Changelog 2014-08-11 19:00:17.000000000 +0200 +++ new/amqp-1.4.7/Changelog 2015-10-03 02:31:01.000000000 +0200 @@ -5,6 +5,27 @@ The previous amqplib changelog is here: http://code.google.com/p/py-amqplib/source/browse/CHANGES +.. _version-1.4.7: + +1.4.7 +===== +:release-date: 2015-10-02 05:30 P.M PDT +:release-by: Ask Solem + +- Fixed libSystem error on OS X 10.11 (El Capitan) + + Fix contributed by Eric Wang. + +- ``channel.basic_publish`` now raises :exc:`amqp.exceptions.NotConfirmed` on + ``basic.nack``. + +- AMQP timestamps received are now converted from GMT instead of local time + (Issue #67). + +- Wheel package installation now supported by both Python 2 and Python3. + + Fix contributed by Rémy Greinhofer. + .. _version-1.4.6: 1.4.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/PKG-INFO new/amqp-1.4.7/PKG-INFO --- old/amqp-1.4.6/PKG-INFO 2014-08-11 19:02:54.000000000 +0200 +++ new/amqp-1.4.7/PKG-INFO 2015-10-03 02:33:44.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: amqp -Version: 1.4.6 +Version: 1.4.7 Summary: Low-level AMQP client for Python (fork of amqplib) Home-page: http://github.com/celery/py-amqp Author: Ask Solem @@ -10,7 +10,7 @@ Python AMQP 0.9.1 client library ===================================================================== - :Version: 1.4.6 + :Version: 1.4.7 :Web: http://amqp.readthedocs.org/ :Download: http://pypi.python.org/pypi/amqp/ :Source: http://github.com/celery/py-amqp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/README.rst new/amqp-1.4.7/README.rst --- old/amqp-1.4.6/README.rst 2014-08-11 19:00:36.000000000 +0200 +++ new/amqp-1.4.7/README.rst 2015-10-03 00:02:20.000000000 +0200 @@ -2,7 +2,7 @@ Python AMQP 0.9.1 client library ===================================================================== -:Version: 1.4.6 +:Version: 1.4.7 :Web: http://amqp.readthedocs.org/ :Download: http://pypi.python.org/pypi/amqp/ :Source: http://github.com/celery/py-amqp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/__init__.py new/amqp-1.4.7/amqp/__init__.py --- old/amqp-1.4.6/amqp/__init__.py 2014-08-11 19:00:30.000000000 +0200 +++ new/amqp-1.4.7/amqp/__init__.py 2015-10-03 00:02:20.000000000 +0200 @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 from __future__ import absolute_import -VERSION = (1, 4, 6) +VERSION = (1, 4, 7) __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:]) __author__ = 'Barry Pederson' __maintainer__ = 'Ask Solem' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/channel.py new/amqp-1.4.7/amqp/channel.py --- old/amqp-1.4.6/amqp/channel.py 2014-08-11 18:56:50.000000000 +0200 +++ new/amqp-1.4.7/amqp/channel.py 2015-10-03 00:06:13.000000000 +0200 @@ -22,7 +22,9 @@ from warnings import warn from .abstract_channel import AbstractChannel -from .exceptions import ChannelError, ConsumerCancelled, error_for_code +from .exceptions import ( + ChannelError, ConsumerCancelled, NotConfirmed, error_for_code, +) from .five import Queue from .protocol import basic_return_t, queue_declare_ok_t from .serialization import AMQPWriter @@ -1069,7 +1071,6 @@ args.write_shortstr(queue) args.write_shortstr(exchange) args.write_shortstr(routing_key) - #args.write_bit(nowait) args.write_table(arguments) self._send_method((50, 50), args) @@ -2127,7 +2128,8 @@ self._confirm_selected = True self.confirm_select() ret = self._basic_publish(*args, **kwargs) - self.wait([(60, 80)]) + # Basic.Ack / Basic.Nack + self.wait([(60, 80), (60, 120)]) return ret def basic_qos(self, prefetch_size, prefetch_count, a_global): @@ -2498,8 +2500,18 @@ def _basic_ack_recv(self, args): delivery_tag = args.read_longlong() multiple = args.read_bit() - for callback in self.events['basic_ack']: - callback(delivery_tag, multiple) + self._apply_callbacks('basic_ack', delivery_tag, multiple) + + def _apply_callbacks(self, event, *args): + return [callback(*args) for callback in self.events[event]] + + def _basic_nack(self, args): + delivery_tag = args.read_longlong() + multiple = args.read_bit() + requeue = args.read_bit() + if not self._apply_callbacks( + 'basic_nack', delivery_tag, multiple, requeue): + raise NotConfirmed(delivery_tag, (60, 120), 'basic.nack') _METHOD_MAP = { (20, 11): _open_ok, @@ -2525,6 +2537,7 @@ (60, 71): _basic_get_ok, (60, 72): _basic_get_empty, (60, 80): _basic_ack_recv, + (60, 120): _basic_nack, (60, 111): _basic_recover_ok, (85, 11): _confirm_select_ok, (90, 11): _tx_select_ok, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/connection.py new/amqp-1.4.7/amqp/connection.py --- old/amqp-1.4.6/amqp/connection.py 2014-08-11 18:56:50.000000000 +0200 +++ new/amqp-1.4.7/amqp/connection.py 2015-10-03 00:05:01.000000000 +0200 @@ -127,8 +127,8 @@ and (password is not None): login_response = AMQPWriter() login_response.write_table({'LOGIN': userid, 'PASSWORD': password}) - login_response = login_response.getvalue()[4:] # Skip the length - # at the beginning + # Skip the length at the beginning + login_response = login_response.getvalue()[4:] d = dict(LIBRARY_PROPERTIES, **client_properties or {}) self._method_override = {(60, 50): self._dispatch_basic_return} @@ -338,7 +338,7 @@ # http://bugs.python.org/issue10272 if 'timed out' in str(exc): raise socket.timeout() - # Non-blocking SSL sockets can throw SSLError + # Non-blocking SSL sockets can throw SSLError if 'The operation did not complete' in str(exc): raise socket.timeout() raise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/exceptions.py new/amqp-1.4.7/amqp/exceptions.py --- old/amqp-1.4.6/amqp/exceptions.py 2014-07-24 17:52:53.000000000 +0200 +++ new/amqp-1.4.7/amqp/exceptions.py 2015-10-03 00:05:01.000000000 +0200 @@ -27,7 +27,7 @@ 'ConnectionForced', 'InvalidPath', 'AccessRefused', 'NotFound', 'ResourceLocked', 'PreconditionFailed', 'FrameError', 'FrameSyntaxError', 'InvalidCommand', 'ChannelNotOpen', 'UnexpectedFrame', 'ResourceError', - 'NotAllowed', 'AMQPNotImplementedError', 'InternalError', + 'NotConfirmed', 'NotAllowed', 'AMQPNotImplementedError', 'InternalError', ] @@ -112,6 +112,10 @@ code = 404 +class NotConfirmed(RecoverableConnectionError): + pass + + class ResourceLocked(RecoverableChannelError): code = 405 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/five.py new/amqp-1.4.7/amqp/five.py --- old/amqp-1.4.6/amqp/five.py 2014-08-11 18:56:50.000000000 +0200 +++ new/amqp-1.4.7/amqp/five.py 2015-10-03 00:02:20.000000000 +0200 @@ -10,7 +10,7 @@ """ from __future__ import absolute_import -############## py3k ######################################################### +# ############# py3k ######################################################### import sys PY3 = sys.version_info[0] == 3 @@ -132,7 +132,7 @@ return _clone_with_metaclass -############## time.monotonic ################################################ +# ############# time.monotonic ################################################ if sys.version_info < (3, 3): @@ -142,7 +142,7 @@ if SYSTEM == 'Darwin': import ctypes from ctypes.util import find_library - libSystem = ctypes.CDLL('libSystem.dylib') + libSystem = ctypes.CDLL(find_library('libSystem.dylib')) CoreServices = ctypes.CDLL(find_library('CoreServices'), use_errno=True) mach_absolute_time = libSystem.mach_absolute_time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/serialization.py new/amqp-1.4.7/amqp/serialization.py --- old/amqp-1.4.6/amqp/serialization.py 2014-08-11 18:56:50.000000000 +0200 +++ new/amqp-1.4.7/amqp/serialization.py 2015-10-03 00:02:20.000000000 +0200 @@ -21,13 +21,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 from __future__ import absolute_import +import calendar import sys from datetime import datetime from decimal import Decimal from io import BytesIO from struct import pack, unpack -from time import mktime from .exceptions import FrameSyntaxError from .five import int_types, long_t, string, string_t, items @@ -224,7 +224,7 @@ expressed as localtime. """ - return datetime.fromtimestamp(self.read_longlong()) + return datetime.utcfromtimestamp(self.read_longlong()) class AMQPWriter(object): @@ -377,7 +377,6 @@ elif isinstance(v, datetime): self.write(b'T') self.write_timestamp(v) - ## FIXME: timezone ? elif isinstance(v, dict): self.write(b'F') self.write_table(v) @@ -402,7 +401,7 @@ def write_timestamp(self, v): """Write out a Python datetime.datetime object as a 64-bit integer representing seconds since the Unix epoch.""" - self.out.write(pack('>q', long_t(mktime(v.timetuple())))) + self.out.write(pack('>Q', long_t(calendar.timegm(v.utctimetuple())))) class GenericContent(object): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/tests/case.py new/amqp-1.4.7/amqp/tests/case.py --- old/amqp-1.4.6/amqp/tests/case.py 1970-01-01 01:00:00.000000000 +0100 +++ new/amqp-1.4.7/amqp/tests/case.py 2015-10-03 00:02:20.000000000 +0200 @@ -0,0 +1,85 @@ +from __future__ import absolute_import + +import sys + +from functools import wraps +from io import StringIO + +import mock + +from nose import SkipTest # noqa + +try: + import unittest + unittest.skip +except AttributeError: + import unittest2 as unittest # noqa + +PY3 = sys.version_info[0] == 3 + +patch = mock.patch +call = mock.call + + +class Case(unittest.TestCase): + + def assertItemsEqual(self, a, b, *args, **kwargs): + return self.assertEqual(sorted(a), sorted(b), *args, **kwargs) + assertSameElements = assertItemsEqual + + +class Mock(mock.Mock): + + def __init__(self, *args, **kwargs): + attrs = kwargs.pop('attrs', None) or {} + super(Mock, self).__init__(*args, **kwargs) + for attr_name, attr_value in attrs.items(): + setattr(self, attr_name, attr_value) + + +class _ContextMock(Mock): + """Dummy class implementing __enter__ and __exit__ + as the with statement requires these to be implemented + in the class, not just the instance.""" + + def __enter__(self): + pass + + def __exit__(self, *exc_info): + pass + + +def ContextMock(*args, **kwargs): + obj = _ContextMock(*args, **kwargs) + obj.attach_mock(Mock(), '__enter__') + obj.attach_mock(Mock(), '__exit__') + obj.__enter__.return_value = obj + # if __exit__ return a value the exception is ignored, + # so it must return None here. + obj.__exit__.return_value = None + return obj + + +class MockPool(object): + + def __init__(self, value=None): + self.value = value or ContextMock() + + def acquire(self, **kwargs): + return self.value + + +def redirect_stdouts(fun): + + @wraps(fun) + def _inner(*args, **kwargs): + sys.stdout = StringIO() + sys.stderr = StringIO() + try: + return fun(*args, **dict(kwargs, + stdout=sys.stdout, stderr=sys.stderr)) + finally: + sys.stdout = sys.__stdout__ + sys.stderr = sys.__stderr__ + + return _inner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp/tests/test_channel.py new/amqp-1.4.7/amqp/tests/test_channel.py --- old/amqp-1.4.6/amqp/tests/test_channel.py 1970-01-01 01:00:00.000000000 +0100 +++ new/amqp-1.4.7/amqp/tests/test_channel.py 2015-10-03 00:02:20.000000000 +0200 @@ -0,0 +1,35 @@ +from __future__ import absolute_import + +from collections import defaultdict + +from amqp.channel import Channel +from amqp.exceptions import NotConfirmed +from amqp.serialization import AMQPWriter, AMQPReader + +from amqp.tests.case import Case, Mock + + +class NoOpenChannel(Channel): + + def _x_open(self): + pass + + +class test_Channel(Case): + + def setUp(self): + self.args = AMQPWriter() + self.connection = Mock(name='connection') + self.connection.channels = defaultdict(lambda: None) + self.channel = NoOpenChannel(self.connection, channel_id=1) + + def test_basic_nack(self, delivery_tag=3172312312): + self.args.write_longlong(delivery_tag) + self.args.write_bit(0) + self.args.write_bit(0) + with self.assertRaises(NotConfirmed): + self.channel._basic_nack(AMQPReader(self.args.getvalue())) + callback = Mock(name='callback') + self.channel.events['basic_nack'].add(callback) + self.channel._basic_nack(AMQPReader(self.args.getvalue())) + callback.assert_called_with(delivery_tag, False, False) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp.egg-info/PKG-INFO new/amqp-1.4.7/amqp.egg-info/PKG-INFO --- old/amqp-1.4.6/amqp.egg-info/PKG-INFO 2014-08-11 19:02:37.000000000 +0200 +++ new/amqp-1.4.7/amqp.egg-info/PKG-INFO 2015-10-03 02:33:39.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: amqp -Version: 1.4.6 +Version: 1.4.7 Summary: Low-level AMQP client for Python (fork of amqplib) Home-page: http://github.com/celery/py-amqp Author: Ask Solem @@ -10,7 +10,7 @@ Python AMQP 0.9.1 client library ===================================================================== - :Version: 1.4.6 + :Version: 1.4.7 :Web: http://amqp.readthedocs.org/ :Download: http://pypi.python.org/pypi/amqp/ :Source: http://github.com/celery/py-amqp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/amqp.egg-info/SOURCES.txt new/amqp-1.4.7/amqp.egg-info/SOURCES.txt --- old/amqp-1.4.6/amqp.egg-info/SOURCES.txt 2014-08-11 19:02:38.000000000 +0200 +++ new/amqp-1.4.7/amqp.egg-info/SOURCES.txt 2015-10-03 02:33:39.000000000 +0200 @@ -2,6 +2,7 @@ LICENSE MANIFEST.in README.rst +setup.cfg setup.py amqp/__init__.py amqp/abstract_channel.py @@ -20,6 +21,9 @@ amqp.egg-info/dependency_links.txt amqp.egg-info/not-zip-safe amqp.egg-info/top_level.txt +amqp/tests/__init__.py +amqp/tests/case.py +amqp/tests/test_channel.py demo/amqp_clock.py demo/demo_receive.py demo/demo_send.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/docs/changelog.rst new/amqp-1.4.7/docs/changelog.rst --- old/amqp-1.4.6/docs/changelog.rst 2014-08-11 19:00:17.000000000 +0200 +++ new/amqp-1.4.7/docs/changelog.rst 2015-10-03 02:31:01.000000000 +0200 @@ -5,6 +5,27 @@ The previous amqplib changelog is here: http://code.google.com/p/py-amqplib/source/browse/CHANGES +.. _version-1.4.7: + +1.4.7 +===== +:release-date: 2015-10-02 05:30 P.M PDT +:release-by: Ask Solem + +- Fixed libSystem error on OS X 10.11 (El Capitan) + + Fix contributed by Eric Wang. + +- ``channel.basic_publish`` now raises :exc:`amqp.exceptions.NotConfirmed` on + ``basic.nack``. + +- AMQP timestamps received are now converted from GMT instead of local time + (Issue #67). + +- Wheel package installation now supported by both Python 2 and Python3. + + Fix contributed by Rémy Greinhofer. + .. _version-1.4.6: 1.4.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-1.4.6/setup.cfg new/amqp-1.4.7/setup.cfg --- old/amqp-1.4.6/setup.cfg 2014-08-11 19:02:54.000000000 +0200 +++ new/amqp-1.4.7/setup.cfg 2015-10-03 02:33:44.000000000 +0200 @@ -1,3 +1,9 @@ +[nosetests] +where = amqp/tests + +[bdist_wheel] +universal = 1 + [egg_info] tag_build = tag_date = 0

1 0

commit python3-astroid for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-astroid for openSUSE:Factory checked in at 2015-11-02 12:55:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-astroid (Old) and /work/SRC/openSUSE:Factory/.python3-astroid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-astroid" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-astroid/python3-astroid.changes 2015-08-02 22:46:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-astroid.new/python3-astroid.changes 2015-11-02 12:55:51.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 1 18:20:58 UTC 2015 - arun(a)gmx.de + +- update to version 1.3.8: + * Backport of 40e3176, which fixes issue #84. + +------------------------------------------------------------------- Old: ---- astroid-1.3.7.tar.gz New: ---- astroid-1.3.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-astroid.spec ++++++ --- /var/tmp/diff_new_pack.8rHLVk/_old 2015-11-02 12:55:51.000000000 +0100 +++ /var/tmp/diff_new_pack.8rHLVk/_new 2015-11-02 12:55:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-astroid -Version: 1.3.7 +Version: 1.3.8 Release: 0 Url: http://bitbucket.org/logilab/astroid Summary: Rebuild a new abstract syntax tree from Python's ast ++++++ astroid-1.3.7.tar.gz -> astroid-1.3.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/ChangeLog new/astroid-1.3.8/ChangeLog --- old/astroid-1.3.7/ChangeLog 2015-07-27 17:07:47.000000000 +0200 +++ new/astroid-1.3.8/ChangeLog 2015-08-02 21:37:44.000000000 +0200 @@ -1,6 +1,10 @@ Change log for the astroid package (used to be astng) ===================================================== +2015-08-02 -- 1.3.8 + + * Backport of 40e3176, which fixes issue #84. + 2015-07-27 -- 1.3.7 * Improve the inference of six.moves, especially when using `from ... import ...` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/PKG-INFO new/astroid-1.3.8/PKG-INFO --- old/astroid-1.3.7/PKG-INFO 2015-07-27 17:33:11.000000000 +0200 +++ new/astroid-1.3.8/PKG-INFO 2015-08-02 22:40:06.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: astroid -Version: 1.3.7 +Version: 1.3.8 Summary: A abstract syntax tree for Python with inference support. Home-page: http://bitbucket.org/logilab/astroid Author: Logilab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/astroid/__pkginfo__.py new/astroid-1.3.8/astroid/__pkginfo__.py --- old/astroid-1.3.7/astroid/__pkginfo__.py 2015-07-27 17:17:12.000000000 +0200 +++ new/astroid-1.3.8/astroid/__pkginfo__.py 2015-08-02 21:37:10.000000000 +0200 @@ -20,10 +20,10 @@ modname = 'astroid' -numversion = (1, 3, 7) +numversion = (1, 3, 8) version = '.'.join([str(num) for num in numversion]) -install_requires = ['logilab-common<=0.63.0', 'six'] +install_requires = ['logilab-common>=0.63.0', 'six'] license = 'LGPL' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/astroid/scoped_nodes.py new/astroid-1.3.8/astroid/scoped_nodes.py --- old/astroid-1.3.7/astroid/scoped_nodes.py 2015-07-27 16:47:38.000000000 +0200 +++ new/astroid-1.3.8/astroid/scoped_nodes.py 2015-08-02 21:35:55.000000000 +0200 @@ -822,7 +822,8 @@ c = Class('temporary_class', None) c.hide = True c.parent = self - c.bases = [next(b.infer(context)) for b in caller.args[1:]] + bases = [next(b.infer(context)) for b in caller.args[1:]] + c.bases = [base for base in bases if base != YES] c._metaclass = metaclass yield c return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/astroid/tests/unittest_regrtest.py new/astroid-1.3.8/astroid/tests/unittest_regrtest.py --- old/astroid-1.3.7/astroid/tests/unittest_regrtest.py 2015-07-27 16:47:38.000000000 +0200 +++ new/astroid-1.3.8/astroid/tests/unittest_regrtest.py 2015-08-02 22:37:37.000000000 +0200 @@ -19,11 +19,14 @@ import unittest import textwrap +import six + from astroid import MANAGER, Instance, nodes +from astroid.bases import BUILTINS from astroid.builder import AstroidBuilder from astroid.raw_building import build_module from astroid.manager import AstroidManager -from astroid.test_utils import require_version +from astroid.test_utils import require_version, extract_node from astroid.tests import resources class NonRegressionTests(resources.AstroidCacheSetupMixin, @@ -241,6 +244,30 @@ ancestors = list(klass.ancestors()) self.assertEqual(ancestors[0].qname(), 'string.Template') + def test_ancestors_yes_in_bases(self): + # Test for issue https://bitbucket.org/logilab/astroid/issue/84 + # This used to crash astroid with a TypeError, because an YES + # node was present in the bases + node = extract_node(""" + def with_metaclass(meta, *bases): + class metaclass(meta): + def __new__(cls, name, this_bases, d): + return meta(name, bases, d) + return type.__new__(metaclass, 'temporary_class', (), {}) + + import lala + + class A(with_metaclass(object, lala.lala)): #@ + pass + """) + ancestors = list(node.ancestors()) + if six.PY3: + self.assertEqual(len(ancestors), 1) + self.assertEqual(ancestors[0].qname(), + "{}.object".format(BUILTINS)) + else: + self.assertEqual(len(ancestors), 0) + class Whatever(object): a = property(lambda x: x, lambda x: x) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/astroid.egg-info/PKG-INFO new/astroid-1.3.8/astroid.egg-info/PKG-INFO --- old/astroid-1.3.7/astroid.egg-info/PKG-INFO 2015-07-27 17:33:04.000000000 +0200 +++ new/astroid-1.3.8/astroid.egg-info/PKG-INFO 2015-08-02 22:40:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: astroid -Version: 1.3.7 +Version: 1.3.8 Summary: A abstract syntax tree for Python with inference support. Home-page: http://bitbucket.org/logilab/astroid Author: Logilab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astroid-1.3.7/astroid.egg-info/requires.txt new/astroid-1.3.8/astroid.egg-info/requires.txt --- old/astroid-1.3.7/astroid.egg-info/requires.txt 2015-07-27 17:33:04.000000000 +0200 +++ new/astroid-1.3.8/astroid.egg-info/requires.txt 2015-08-02 22:40:00.000000000 +0200 @@ -1,2 +1,2 @@ -logilab-common<=0.63.0 +logilab-common>=0.63.0 six

1 0

commit python3-cffi for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-cffi for openSUSE:Factory checked in at 2015-11-02 12:55:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-cffi (Old) and /work/SRC/openSUSE:Factory/.python3-cffi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-cffi" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-cffi/python3-cffi.changes 2015-06-16 14:05:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-cffi.new/python3-cffi.changes 2015-11-02 12:55:50.000000000 +0100 @@ -1,0 +2,68 @@ +Sun Nov 1 19:29:10 UTC 2015 - arun(a)gmx.de + +- update to version 1.3.0: + * Added ffi.memmove(). + * Pull request #64: out-of-line API mode: we can now declare + floating-point types with typedef float... foo_t;. This only works + if foo_t is a float or a double, not long double. + * Issue #217: fix possible unaligned pointer manipulation, which + crashes on some architectures (64-bit, non-x86). + * Issues #64 and #126: when using set_source() or verify(), the + const and restrict keywords are copied from the cdef to the + generated C code; this fixes warnings by the C compiler. It also + fixes corner cases like typedef const int T; T a; which would + previously not consider a as a constant. (The cdata objects + themselves are never const.) + * Win32: support for __stdcall. For callbacks and function pointers; + regular C functions still don’t need to have their calling + convention declared. + * Windows: CPython 2.7 distutils doesn’t work with Microsoft’s + official Visual Studio for Python, and I’m told this is not a + bug. For ffi.compile(), we removed a workaround that was inside + cffi but which had unwanted side-effects. Try saying import + setuptools first, which patches distutils... + +- changes from version 1.2.1: + * Nothing changed from v1.2.0. + +- changes from version 1.2.0: + * Out-of-line mode: int a[][...]; can be used to declare a structure + field or global variable which is, simultaneously, of total length + unknown to the C compiler (the a[] part) and each element is + itself an array of N integers, where the value of N is known to + the C compiler (the int and [...] parts around it). Similarly, int + a[5][...]; is supported (but probably less useful: remember that + in C it means int (a[5])[...];). + * PyPy: the lib.some_function objects were missing the attributes + __name__, __module__ and __doc__ that are expected e.g. by some + decorators-management functions from functools. + * Out-of-line API mode: you can now do from _example.lib import x to + import the name x from _example.lib, even though the lib object is + not a standard module object. (Also works in from _example.lib + import *, but this is even more of a hack and will fail if lib + happens to declare a name called __all__. Note that * excludes the + global variables; only the functions and constants make sense to + import like this.) + * lib.__dict__ works again and gives you a copy of the dict—assuming + that lib has got no symbol called precisely __dict__. (In general, + it is safer to use dir(lib).) + * Out-of-line API mode: global variables are now fetched on demand + at every access. It fixes issue #212 (Windows DLL variables), and + also allows variables that are defined as dynamic macros (like + errno) or __thread -local variables. (This change might also + tighten the C compiler’s check on the variables’ type.) + * Issue #209: dereferencing NULL pointers now raises RuntimeError + instead of segfaulting. Meant as a debugging aid. The check is + only for NULL: if you dereference random or dead pointers you + might still get segfaults. + * Issue #152: callbacks: added an argument ffi.callback(..., + onerror=...). If the main callback function raises an exception + and onerror is provided, then onerror(exception, exc_value, + traceback) is called. This is similar to writing a try: except: in + the main callback function, but in some cases (e.g. a signal) an + exception can occur at the very start of the callback + function—before it had time to enter the try: except: block. + * Issue #115: added ffi.new_allocator(), which officializes support + for alternative allocators. + +------------------------------------------------------------------- Old: ---- cffi-1.1.2.tar.gz New: ---- cffi-1.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-cffi.spec ++++++ --- /var/tmp/diff_new_pack.HKGPii/_old 2015-11-02 12:55:51.000000000 +0100 +++ /var/tmp/diff_new_pack.HKGPii/_new 2015-11-02 12:55:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-cffi -Version: 1.1.2 +Version: 1.3.0 Release: 0 Summary: Foreign Function Interface for Python calling C code License: MIT ++++++ cffi-1.1.2.tar.gz -> cffi-1.3.0.tar.gz ++++++ ++++ 6293 lines of diff (skipped)

1 0

commit python3-urwid for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-urwid for openSUSE:Factory checked in at 2015-11-02 12:55:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-urwid (Old) and /work/SRC/openSUSE:Factory/.python3-urwid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-urwid" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-urwid/python3-urwid.changes 2015-01-08 23:02:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-urwid.new/python3-urwid.changes 2015-11-02 12:55:49.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 2 01:38:20 UTC 2015 - arun(a)gmx.de + +- update to version 1.3.1: + * Fix for screen not getting reset on exception regression + (by Rian Hunter) + * AttrSpec objects are now comparable (by Random User) + * MonitoredList now has a clear method if list has a clear method + (by neumond) + * Fix for BarGraph hlines sort order (by Heiko Noordhof) + * Fix for final output not appearing on exit with some terminals + now that extra newline was removed (by Jared Winborne) + * Fix for a resizing bug in raw_display (by Esteban null) + +------------------------------------------------------------------- Old: ---- urwid-1.3.0.tar.gz New: ---- urwid-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-urwid.spec ++++++ --- /var/tmp/diff_new_pack.ipaKF2/_old 2015-11-02 12:55:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ipaKF2/_new 2015-11-02 12:55:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-urwid # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-urwid -Version: 1.3.0 +Version: 1.3.1 Release: 0 Url: http://excess.org/urwid/ Summary: A full-featured console (xterm et al.) user interface library ++++++ urwid-1.3.0.tar.gz -> urwid-1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/PKG-INFO new/urwid-1.3.1/PKG-INFO --- old/urwid-1.3.0/PKG-INFO 2014-10-17 20:27:53.000000000 +0200 +++ new/urwid-1.3.1/PKG-INFO 2015-11-02 01:08:49.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: urwid -Version: 1.3.0 +Version: 1.3.1 Summary: A full-featured console (xterm et al.) user interface library Home-page: http://urwid.org/ Author: Ian Ward @@ -10,7 +10,7 @@ Urwid is a console user interface library for Python. It includes many features useful for text console application developers including: - - Applcations resize quickly and smoothly + - Applications resize quickly and smoothly - Automatic, programmable text alignment and wrapping - Simple markup for setting text attributes within blocks of text - Powerful list box with programmable content for scrolling all widget types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/README.rst new/urwid-1.3.1/README.rst --- old/urwid-1.3.0/README.rst 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/README.rst 2015-11-02 01:08:16.000000000 +0100 @@ -9,7 +9,7 @@ Urwid is a console user interface library for Python. It includes many features useful for text console application developers including: -- Applcations resize quickly and smoothly +- Applications resize quickly and smoothly - Automatic, programmable text alignment and wrapping - Simple markup for setting text attributes within blocks of text - Powerful list box with programmable content for scrolling all widget types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/docs/changelog.rst new/urwid-1.3.1/docs/changelog.rst --- old/urwid-1.3.0/docs/changelog.rst 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/docs/changelog.rst 2015-11-02 01:08:16.000000000 +0100 @@ -2,6 +2,26 @@ Changelog --------- +Urwid 1.3.1 +=========== + +2015-11-01 + + * Fix for screen not getting reset on exception regression + (by Rian Hunter) + + * AttrSpec objects are now comparable (by Random User) + + * MonitoredList now has a clear method if list has a clear method + (by neumond) + + * Fix for BarGraph hlines sort order (by Heiko Noordhof) + + * Fix for final output not appearing on exit with some terminals + now that extra newline was removed (by Jared Winborne) + + * Fix for a resizing bug in raw_display (by Esteban null) + Urwid 1.3.0 =========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/docs/tools/templates/indexcontent.html new/urwid-1.3.1/docs/tools/templates/indexcontent.html --- old/urwid-1.3.0/docs/tools/templates/indexcontent.html 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/docs/tools/templates/indexcontent.html 2015-11-02 01:08:16.000000000 +0100 @@ -53,6 +53,7 @@ <ul> <li><a href="http://www.npcole.com/npyscreen/">npyscreen</a></li> <li><a href="https://github.com/thomasballinger/curtsies">curtsies</a></li> +<li><a href="https://github.com/jonathanslenders/python-prompt-toolkit">Python Prompt Toolkit</a></li> </ul> </div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/docs/tutorial/new/adventure.py new/urwid-1.3.1/docs/tutorial/new/adventure.py --- old/urwid-1.3.0/docs/tutorial/new/adventure.py 1970-01-01 01:00:00.000000000 +0100 +++ new/urwid-1.3.1/docs/tutorial/new/adventure.py 2013-12-31 17:45:44.000000000 +0100 @@ -0,0 +1,83 @@ +import urwid + +class ActionButton(urwid.Button): + def __init__(self, caption, callback): + super(ActionButton, self).__init__("") + urwid.connect_signal(self, 'click', callback) + self._w = urwid.AttrMap(urwid.SelectableIcon(caption, 1), + None, focus_map='reversed') + +class Place(urwid.WidgetWrap): + def __init__(self, name, choices): + super(Place, self).__init__( + ActionButton([u" > go to ", name], self.enter_place)) + self.heading = urwid.Text([u"\nLocation: ", name, "\n"]) + self.choices = choices + # create links back to ourself + for child in choices: + getattr(child, 'choices', []).insert(0, self) + + def enter_place(self, button): + game.update_place(self) + +class Thing(urwid.WidgetWrap): + def __init__(self, name): + super(Thing, self).__init__( + ActionButton([u" * take ", name], self.take_thing)) + self.name = name + + def take_thing(self, button): + self._w = urwid.Text(u" - %s (taken)" % self.name) + game.take_thing(self) + +def exit_program(button): + raise urwid.ExitMainLoop() + +map_top = Place(u'porch', [ + Place(u'kitchen', [ + Place(u'refrigerator', []), + Place(u'cupboard', [ + Thing(u'jug'), + ]), + ]), + Place(u'garden', [ + Place(u'tree', [ + Thing(u'lemon'), + Thing(u'bird'), + ]), + ]), + Place(u'street', [ + Place(u'store', [ + Thing(u'sugar'), + ]), + Place(u'lake', [ + Place(u'beach', []), + ]), + ]), +]) + +class AdventureGame(object): + def __init__(self): + self.log = urwid.SimpleFocusListWalker([]) + self.top = urwid.ListBox(self.log) + self.inventory = set() + self.update_place(map_top) + + def update_place(self, place): + if self.log: # disable interaction with previous place + self.log[-1] = urwid.WidgetDisable(self.log[-1]) + self.log.append(urwid.Pile([place.heading] + place.choices)) + self.top.focus_position = len(self.log) - 1 + self.place = place + + def take_thing(self, thing): + self.inventory.add(thing.name) + if self.inventory >= set([u'sugar', u'lemon', u'jug']): + response = urwid.Text(u'You can make lemonade!\n') + done = ActionButton(u' - Joy', exit_program) + self.log[:] = [response, done] + else: + self.update_place(self.place) + +game = AdventureGame() +urwid.MainLoop(game.top, palette=[('reversed', 'standout', '')]).run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/docs/tutorial/new/adventure.py.xdotool new/urwid-1.3.1/docs/tutorial/new/adventure.py.xdotool --- old/urwid-1.3.0/docs/tutorial/new/adventure.py.xdotool 1970-01-01 01:00:00.000000000 +0100 +++ new/urwid-1.3.1/docs/tutorial/new/adventure.py.xdotool 2013-12-31 17:45:44.000000000 +0100 @@ -0,0 +1,4 @@ +windowsize --usehints $RXVTWINDOWID 23 16 +key --window $RXVTWINDOWID Return Down Down +key --window $RXVTWINDOWID Return Down +key --window $RXVTWINDOWID Return Files old/urwid-1.3.0/docs/tutorial/new/adventure1.png and new/urwid-1.3.1/docs/tutorial/new/adventure1.png differ Files old/urwid-1.3.0/docs/tutorial/new/adventure2.png and new/urwid-1.3.1/docs/tutorial/new/adventure2.png differ Files old/urwid-1.3.0/docs/tutorial/new/adventure3.png and new/urwid-1.3.1/docs/tutorial/new/adventure3.png differ Files old/urwid-1.3.0/docs/tutorial/new/adventure4.png and new/urwid-1.3.1/docs/tutorial/new/adventure4.png differ Files old/urwid-1.3.0/docs/tutorial/new/lbscr1.png and new/urwid-1.3.1/docs/tutorial/new/lbscr1.png differ Files old/urwid-1.3.0/docs/tutorial/new/minimal1.png and new/urwid-1.3.1/docs/tutorial/new/minimal1.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/source/str_util.c new/urwid-1.3.1/source/str_util.c --- old/urwid-1.3.0/source/str_util.c 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/source/str_util.c 2015-11-02 01:08:16.000000000 +0100 @@ -40,7 +40,7 @@ #endif static int widths_len = 2*38; -static const long int widths[] = { +static const int widths[] = { 126, 1, 159, 0, 687, 1, @@ -709,7 +709,7 @@ { PyObject *text; int start_offs, end_offs; - int ret; + long ret; if (!PyArg_ParseTuple(args, "Oii", &text, &start_offs, &end_offs)) return NULL; @@ -717,8 +717,8 @@ ret = Py_CalcWidth(text, start_offs, end_offs); if (ret==-1) //an error occured return NULL; - - return Py_BuildValue("i", ret); + + return Py_BuildValue("l", ret); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/display_common.py new/urwid-1.3.1/urwid/display_common.py --- old/urwid-1.3.0/urwid/display_common.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/display_common.py 2015-11-02 01:08:16.000000000 +0100 @@ -574,7 +574,7 @@ flags |= _FG_HIGH_COLOR # _parse_color_*() return None for unrecognised colors if scolor is None: - raise AttrSpecError(("Unrecognised color specification %s" + + raise AttrSpecError(("Unrecognised color specification %s " + "in foreground (%s)") % (repr(part), repr(foreground))) if color is not None: raise AttrSpecError(("More than one color given for " + @@ -646,6 +646,13 @@ else: return vals + _COLOR_VALUES_256[self.background_number] + def __eq__(self, other): + return isinstance(other, AttrSpec) and self._value == other._value + + def __ne__(self, other): + return not self == other + + __hash__ = object.__hash__ class RealTerminal(object): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/escape.py new/urwid-1.3.1/urwid/escape.py --- old/urwid-1.3.0/urwid/escape.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/escape.py 2015-11-02 01:08:16.000000000 +0100 @@ -88,6 +88,8 @@ ('[Z','shift tab'), ('On', '.'), + + ('[200~', 'begin paste'), ('[201~', 'end paste'), ] + [ (prefix + letter, modifier + key) for prefix, modifier in zip('O[', ('meta ', 'shift ')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/graphics.py new/urwid-1.3.1/urwid/graphics.py --- old/urwid-1.3.0/urwid/graphics.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/graphics.py 2015-11-02 01:08:16.000000000 +0100 @@ -304,6 +304,7 @@ if hlines is not None: hlines = hlines[:] # shallow copy hlines.sort() + hlines.reverse() self.data = bardata, top, hlines self._invalidate() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/main_loop.py new/urwid-1.3.1/urwid/main_loop.py --- old/urwid-1.3.0/urwid/main_loop.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/main_loop.py 2015-11-02 01:08:16.000000000 +0100 @@ -372,7 +372,11 @@ finally: self.screen.stop() - self.event_loop.run() + try: + self.event_loop.run() + except: + self.screen.stop() # clean up screen control + raise self.stop() def _update(self, keys, raw): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/monitored_list.py new/urwid-1.3.1/urwid/monitored_list.py --- old/urwid-1.3.0/urwid/monitored_list.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/monitored_list.py 2015-11-02 01:08:16.000000000 +0100 @@ -80,6 +80,8 @@ remove = _call_modified(list.remove) reverse = _call_modified(list.reverse) sort = _call_modified(list.sort) + if hasattr(list, 'clear'): + clear = _call_modified(list.clear) class MonitoredFocusList(MonitoredList): @@ -474,6 +476,13 @@ self._set_focus(self.index(value)) return rval + if hasattr(list, 'clear'): + def clear(self): + focus = self._adjust_focus_on_contents_modified(slice(0, 0)) + rval = super(MonitoredFocusList, self).clear() + self._set_focus(focus) + return rval + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/raw_display.py new/urwid-1.3.1/urwid/raw_display.py --- old/urwid-1.3.0/urwid/raw_display.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/raw_display.py 2015-11-02 01:08:16.000000000 +0100 @@ -251,6 +251,7 @@ + escape.SI + move_cursor + escape.SHOW_CURSOR) + self.flush() if self._old_signal_keys: self.tty_signal_keys(*(self._old_signal_keys + (fd,))) @@ -746,7 +747,7 @@ cy = 0 for row in r.content(): y += 1 - if osb and osb[y] == row: + if osb and y < len(osb) and osb[y] == row: # this row of the screen buffer matches what is # currently displayed, so we can skip this line sb.append( osb[y] ) @@ -935,7 +936,7 @@ bg = "5;%d" % (a.background_number - 8 + 40) else: # this doesn't work on most terminals - bg = "%d" % (a.background_number + 100) + bg = "%d" % (a.background_number - 8 + 100) else: bg = "%d" % (a.background_number + 40) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid/version.py new/urwid-1.3.1/urwid/version.py --- old/urwid-1.3.0/urwid/version.py 2014-10-17 20:09:04.000000000 +0200 +++ new/urwid-1.3.1/urwid/version.py 2015-11-02 01:08:16.000000000 +0100 @@ -1,5 +1,5 @@ -VERSION = (1, 3, 0) +VERSION = (1, 3, 1) __version__ = ''.join(['-.'[type(x) == int]+str(x) for x in VERSION])[1:] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid.egg-info/PKG-INFO new/urwid-1.3.1/urwid.egg-info/PKG-INFO --- old/urwid-1.3.0/urwid.egg-info/PKG-INFO 2014-10-17 20:27:53.000000000 +0200 +++ new/urwid-1.3.1/urwid.egg-info/PKG-INFO 2015-11-02 01:08:49.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: urwid -Version: 1.3.0 +Version: 1.3.1 Summary: A full-featured console (xterm et al.) user interface library Home-page: http://urwid.org/ Author: Ian Ward @@ -10,7 +10,7 @@ Urwid is a console user interface library for Python. It includes many features useful for text console application developers including: - - Applcations resize quickly and smoothly + - Applications resize quickly and smoothly - Automatic, programmable text alignment and wrapping - Simple markup for setting text attributes within blocks of text - Powerful list box with programmable content for scrolling all widget types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urwid-1.3.0/urwid.egg-info/SOURCES.txt new/urwid-1.3.1/urwid.egg-info/SOURCES.txt --- old/urwid-1.3.0/urwid.egg-info/SOURCES.txt 2014-10-17 20:27:53.000000000 +0200 +++ new/urwid-1.3.1/urwid.egg-info/SOURCES.txt 2015-11-02 01:08:49.000000000 +0100 @@ -152,6 +152,14 @@ docs/tutorial/smenu1.png docs/tutorial/smenu2.png docs/tutorial/smenu3.png +docs/tutorial/new/adventure.py +docs/tutorial/new/adventure.py.xdotool +docs/tutorial/new/adventure1.png +docs/tutorial/new/adventure2.png +docs/tutorial/new/adventure3.png +docs/tutorial/new/adventure4.png +docs/tutorial/new/lbscr1.png +docs/tutorial/new/minimal1.png examples/asyncio_socket_server.py examples/bigtext.py examples/browse.py

1 0

commit python3-WebOb for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-WebOb for openSUSE:Factory checked in at 2015-11-02 12:55:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-WebOb (Old) and /work/SRC/openSUSE:Factory/.python3-WebOb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-WebOb" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-WebOb/python3-WebOb.changes 2015-04-18 10:39:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-WebOb.new/python3-WebOb.changes 2015-11-02 12:55:48.000000000 +0100 @@ -1,0 +2,36 @@ +Sun Nov 1 19:54:14 UTC 2015 - arun(a)gmx.de + +- specfile: + * doc/news.txt -> doc/changes.txt + +- update to version 1.5.1: + * The exceptions HTTPNotAcceptable, HTTPUnsupportedMediaType and + HTTPNotImplemented will now correctly use the sub-classed template + rather than the default error template. See + https://github.com/Pylons/webob/issues/221 + * Response’s from_file now correctly deals with a status line that + contains an HTTP version identifier. HTTP/1.1 200 OK is now + correctly parsed, whereas before this would raise an error upon + setting the Response.status in from_file. See + https://github.com/Pylons/webob/issues/121 + +- changes from version 1.5.0: + * The cookie API functions will now make sure that max_age is an + integer or an string that can convert to an integer. Previously + passing in max_age=’test’ would have silently done the wrong + thing. + * Unbreak req.POST when the request method is PATCH. Instead of + returning something cmpletely unrelated we return NoVar. See: + https://github.com/Pylons/webob/pull/215 + * HTTP Status Code 308 is now supported as a Permanent Redirect. See + https://github.com/Pylons/webob/pull/207 + * Response.set_cookie renamed the only required parameter from "key" + to "name". The code will now still accept “key” as a keyword + argument, and will issue a DeprecationWarning until WebOb 1.7. + * The status attribute of a Response object no longer takes a string + like None None and allows that to be set as the status. It now has + to at least match the pattern of <integer status code> + <explenation of status code>. Invalid status strings will now + raise a ValueError. + +------------------------------------------------------------------- Old: ---- WebOb-1.4.1.tar.gz New: ---- WebOb-1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-WebOb.spec ++++++ --- /var/tmp/diff_new_pack.bMg2iS/_old 2015-11-02 12:55:48.000000000 +0100 +++ /var/tmp/diff_new_pack.bMg2iS/_new 2015-11-02 12:55:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-WebOb -Version: 1.4.1 +Version: 1.5.1 Release: 0 Summary: WSGI request and response object License: MIT @@ -71,6 +71,6 @@ %files doc %defattr(-,root,root,-) -%doc docs/news.txt build/sphinx/html +%doc docs/changes.txt build/sphinx/html %changelog ++++++ WebOb-1.4.1.tar.gz -> WebOb-1.5.1.tar.gz ++++++ ++++ 8030 lines of diff (skipped)

1 0

commit python3-Mako for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-Mako for openSUSE:Factory checked in at 2015-11-02 12:55:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Mako (Old) and /work/SRC/openSUSE:Factory/.python3-Mako.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-Mako" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Mako/python3-Mako.changes 2015-10-28 17:30:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-Mako.new/python3-Mako.changes 2015-11-02 12:55:47.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 1 18:22:24 UTC 2015 - arun(a)gmx.de + +- update to version 1.0.3: + * Fixed an issue where the Babel plugin would not handle a + translation symbol that contained non-ascii characters. Pull + request courtesy Roman Imankulov. + +------------------------------------------------------------------- Old: ---- Mako-1.0.2.tar.gz New: ---- Mako-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Mako.spec ++++++ --- /var/tmp/diff_new_pack.w4Kiys/_old 2015-11-02 12:55:47.000000000 +0100 +++ /var/tmp/diff_new_pack.w4Kiys/_new 2015-11-02 12:55:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-Mako -Version: 1.0.2 +Version: 1.0.3 Release: 0 Url: http://www.makotemplates.org/ Summary: A super-fast Python templating language ++++++ Mako-1.0.2.tar.gz -> Mako-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/Mako.egg-info/PKG-INFO new/Mako-1.0.3/Mako.egg-info/PKG-INFO --- old/Mako-1.0.2/Mako.egg-info/PKG-INFO 2015-08-26 20:05:54.000000000 +0200 +++ new/Mako-1.0.3/Mako.egg-info/PKG-INFO 2015-10-27 17:40:26.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Mako -Version: 1.0.2 +Version: 1.0.3 Summary: A super-fast templating language that borrows the best ideas from the existing templating languages. Home-page: http://www.makotemplates.org/ Author: Mike Bayer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/Mako.egg-info/SOURCES.txt new/Mako-1.0.3/Mako.egg-info/SOURCES.txt --- old/Mako-1.0.2/Mako.egg-info/SOURCES.txt 2015-08-26 20:05:54.000000000 +0200 +++ new/Mako-1.0.3/Mako.egg-info/SOURCES.txt 2015-10-27 17:40:26.000000000 +0100 @@ -9,7 +9,6 @@ Mako.egg-info/dependency_links.txt Mako.egg-info/entry_points.txt Mako.egg-info/not-zip-safe -Mako.egg-info/pbr.json Mako.egg-info/requires.txt Mako.egg-info/top_level.txt doc/caching.html @@ -166,6 +165,8 @@ test/templates/cmd_syntax.mako test/templates/crlf.html test/templates/gettext.mako +test/templates/gettext_cp1251.mako +test/templates/gettext_utf8.mako test/templates/index.html test/templates/internationalization.html test/templates/modtest.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/Mako.egg-info/pbr.json new/Mako-1.0.3/Mako.egg-info/pbr.json --- old/Mako-1.0.2/Mako.egg-info/pbr.json 2015-08-26 20:05:54.000000000 +0200 +++ new/Mako-1.0.3/Mako.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -{"is_release": false, "git_version": "1de5a33"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/PKG-INFO new/Mako-1.0.3/PKG-INFO --- old/Mako-1.0.2/PKG-INFO 2015-08-26 20:05:54.000000000 +0200 +++ new/Mako-1.0.3/PKG-INFO 2015-10-27 17:40:27.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Mako -Version: 1.0.2 +Version: 1.0.3 Summary: A super-fast templating language that borrows the best ideas from the existing templating languages. Home-page: http://www.makotemplates.org/ Author: Mike Bayer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/_sources/changelog.txt new/Mako-1.0.3/doc/_sources/changelog.txt --- old/Mako-1.0.2/doc/_sources/changelog.txt 2015-08-26 20:02:37.000000000 +0200 +++ new/Mako-1.0.3/doc/_sources/changelog.txt 2015-10-27 17:38:22.000000000 +0100 @@ -6,6 +6,18 @@ === .. changelog:: + :version: 1.0.3 + :released: Tue Oct 27 2015 + + .. change:: + :tags: bug, babel + :pullreq: bitbucket:21 + + Fixed an issue where the Babel plugin would not handle a translation + symbol that contained non-ascii characters. Pull request courtesy + Roman Imankulov. + +.. changelog:: :version: 1.0.2 :released: Wed Aug 26 2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/build/changelog.rst new/Mako-1.0.3/doc/build/changelog.rst --- old/Mako-1.0.2/doc/build/changelog.rst 2015-08-26 20:02:37.000000000 +0200 +++ new/Mako-1.0.3/doc/build/changelog.rst 2015-10-27 17:38:22.000000000 +0100 @@ -6,6 +6,18 @@ === .. changelog:: + :version: 1.0.3 + :released: Tue Oct 27 2015 + + .. change:: + :tags: bug, babel + :pullreq: bitbucket:21 + + Fixed an issue where the Babel plugin would not handle a translation + symbol that contained non-ascii characters. Pull request courtesy + Roman Imankulov. + +.. changelog:: :version: 1.0.2 :released: Wed Aug 26 2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/caching.html new/Mako-1.0.3/doc/caching.html --- old/Mako-1.0.2/doc/caching.html 2015-08-26 20:02:57.000000000 +0200 +++ new/Mako-1.0.3/doc/caching.html 2015-10-27 17:38:31.000000000 +0100 @@ -6,7 +6,7 @@ Caching — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Changelog" href="changelog.html" /> <link rel="prev" title="The Unicode Chapter" href="unicode.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Caching @@ -284,7 +284,7 @@ expiring after 60 seconds. The other is a Memcached region, where values should expire in five minutes. To configure our <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><code class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></code></a>, first we get a handle to a -<a class="reference external" href="http://beaker.readthedocs.org/en/latest/modules/cache.html#beaker.cache.Cac…" title="(in Beaker v1.6)"><code class="xref py py-class docutils literal"><span class="pre">beaker.cache.CacheManager</span></code></a>:</p> +<a class="reference external" href="http://beaker.readthedocs.org/en/latest/modules/cache.html#beaker.cache.Cac…" title="(in Beaker v1.7)"><code class="xref py py-class docutils literal"><span class="pre">beaker.cache.CacheManager</span></code></a>:</p> <div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">beaker.cache</span> <span class="kn">import</span> <span class="n">CacheManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="n">CacheManager</span><span class="p">(</span><span class="n">cache_regions</span><span class="o">=</span><span class="p">{</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/changelog.html new/Mako-1.0.3/doc/changelog.html --- old/Mako-1.0.2/doc/changelog.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/changelog.html 2015-10-27 17:38:31.000000000 +0100 @@ -6,7 +6,7 @@ Changelog — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="prev" title="Caching" href="caching.html" /> @@ -71,7 +71,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -83,7 +83,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -105,7 +105,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Changelog @@ -126,6 +126,7 @@ <ul> <li><a class="reference internal" href="#">Changelog</a><ul> <li><a class="reference internal" href="#id1">1.0</a><ul> +<li><a class="reference internal" href="#change-1.0.3">1.0.3</a></li> <li><a class="reference internal" href="#change-1.0.2">1.0.2</a></li> <li><a class="reference internal" href="#change-1.0.1">1.0.1</a></li> <li><a class="reference internal" href="#change-1.0.0">1.0.0</a></li> @@ -209,6 +210,16 @@ <h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h1> <div class="section" id="id1"> <h2>1.0<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2> +<div class="section" id="change-1.0.3"> +<h3>1.0.3<a class="headerlink" href="#change-1.0.3" title="Permalink to this headline">¶</a></h3> +Released: Tue Oct 27 2015<ul class="simple"> +<li><p id="change-1.0.3-0"><span class="target" id="change-a8691815262bf7a1a4857ab58b59972d"><strong>[babel] [bug] </strong></span>Fixed an issue where the Babel plugin would not handle a translation +symbol that contained non-ascii characters. Pull request courtesy +Roman Imankulov.<a class="changeset-link headerlink reference internal" href="#change-a8691815262bf7a1a4857ab58b59972d">¶</a><p>References: <a class="reference external" href="https://bitbucket.org/zzzeek/mako/pull-request/21">pull request bitbucket:21</a></p> +</p> +</li> +</ul> +</div> <div class="section" id="change-1.0.2"> <h3>1.0.2<a class="headerlink" href="#change-1.0.2" title="Permalink to this headline">¶</a></h3> Released: Wed Aug 26 2015<ul class="simple"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/defs.html new/Mako-1.0.3/doc/defs.html --- old/Mako-1.0.2/doc/defs.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/defs.html 2015-10-27 17:38:31.000000000 +0100 @@ -6,7 +6,7 @@ Defs and Blocks — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="The Mako Runtime Environment" href="runtime.html" /> <link rel="prev" title="Syntax" href="syntax.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Defs and Blocks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/filtering.html new/Mako-1.0.3/doc/filtering.html --- old/Mako-1.0.2/doc/filtering.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/filtering.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Filtering and Buffering — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="The Unicode Chapter" href="unicode.html" /> <link rel="prev" title="Inheritance" href="inheritance.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Filtering and Buffering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/genindex.html new/Mako-1.0.3/doc/genindex.html --- old/Mako-1.0.2/doc/genindex.html 2015-08-26 20:02:59.000000000 +0200 +++ new/Mako-1.0.3/doc/genindex.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Index — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="#" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> @@ -70,7 +70,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -82,7 +82,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -100,7 +100,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/index.html new/Mako-1.0.3/doc/index.html --- old/Mako-1.0.2/doc/index.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/index.html 2015-10-27 17:38:32.000000000 +0100 @@ -3,7 +3,7 @@ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <head> <title> - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -21,7 +21,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -31,7 +31,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="#" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="#" /> <link rel="next" title="Usage" href="usage.html" /> @@ -68,7 +68,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -80,7 +80,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -102,7 +102,7 @@ </div> <div id="docs-navigation-banner"> - <a href="#">Mako 1.0.2 Documentation</a> + <a href="#">Mako 1.0.3 Documentation</a> <h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/inheritance.html new/Mako-1.0.3/doc/inheritance.html --- old/Mako-1.0.2/doc/inheritance.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/inheritance.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Inheritance — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Filtering and Buffering" href="filtering.html" /> <link rel="prev" title="Namespaces" href="namespaces.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Inheritance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/namespaces.html new/Mako-1.0.3/doc/namespaces.html --- old/Mako-1.0.2/doc/namespaces.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/namespaces.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Namespaces — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Inheritance" href="inheritance.html" /> <link rel="prev" title="The Mako Runtime Environment" href="runtime.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Namespaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/runtime.html new/Mako-1.0.3/doc/runtime.html --- old/Mako-1.0.2/doc/runtime.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/runtime.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ The Mako Runtime Environment — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Namespaces" href="namespaces.html" /> <link rel="prev" title="Defs and Blocks" href="defs.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » The Mako Runtime Environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/search.html new/Mako-1.0.3/doc/search.html --- old/Mako-1.0.2/doc/search.html 2015-08-26 20:02:59.000000000 +0200 +++ new/Mako-1.0.3/doc/search.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Search — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -35,7 +35,7 @@ <script type="text/javascript" src="_static/searchtools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="#" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> @@ -71,7 +71,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -83,7 +83,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -101,7 +101,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Search diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/searchindex.js new/Mako-1.0.3/doc/searchindex.js --- old/Mako-1.0.2/doc/searchindex.js 2015-08-26 20:02:59.000000000 +0200 +++ new/Mako-1.0.3/doc/searchindex.js 2015-10-27 17:38:32.000000000 +0100 @@ -1 +1 @@ -Search.setIndex({envversion:46,filenames:["caching","changelog","defs","filtering","index","inheritance","namespaces","runtime","syntax","unicode","usage"],objects:{"mako.cache":{Cache:[0,2,1,""],CacheImpl:[0,2,1,""],register_plugin:[0,3,1,""]},"mako.cache.Cache":{get:[0,1,1,""],get_or_create:[0,1,1,""],id:[0,0,1,""],impl:[0,0,1,""],invalidate:[0,1,1,""],invalidate_body:[0,1,1,""],invalidate_closure:[0,1,1,""],invalidate_def:[0,1,1,""],put:[0,1,1,""],set:[0,1,1,""],starttime:[0,0,1,""]},"mako.cache.CacheImpl":{get:[0,1,1,""],get_or_create:[0,1,1,""],invalidate:[0,1,1,""],pass_context:[0,0,1,""],set:[0,1,1,""]},"mako.exceptions":{RichTraceback:[10,2,1,""],html_error_template:[10,3,1,""],text_error_template:[10,3,1,""]},"mako.ext.beaker_cache":{BeakerCacheImpl:[0,2,1,""]},"mako.lookup":{TemplateCollection:[10,2,1,""],TemplateLookup:[10,2,1,""]},"mako.lookup.TemplateCollection":{adjust_uri:[10,1,1,""],filename_to_uri:[10,1,1,""],get_template:[10,1,1,""],has_template:[10,1,1,""]},"mako.lookup.TemplateLookup":{adjust_uri:[10,1,1,""],filename_to_uri:[10,1,1,""],get_template:[10,1,1,""],put_string:[10,1,1,""],put_template:[10,1,1,""]},"mako.runtime":{Context:[7,2,1,""],LoopContext:[7,2,1,""],ModuleNamespace:[6,2,1,""],Namespace:[6,2,1,""],TemplateNamespace:[6,2,1,""],Undefined:[7,2,1,""],capture:[6,3,1,""],supports_caller:[6,3,1,""]},"mako.runtime.Context":{get:[7,1,1,""],keys:[7,1,1,""],kwargs:[7,0,1,""],lookup:[7,0,1,""],pop_caller:[7,1,1,""],push_caller:[7,1,1,""],write:[7,1,1,""],writer:[7,1,1,""]},"mako.runtime.LoopContext":{cycle:[7,1,1,""]},"mako.runtime.ModuleNamespace":{filename:[6,0,1,""]},"mako.runtime.Namespace":{attr:[6,0,1,""],cache:[6,0,1,""],context:[6,0,1,""],filename:[6,0,1,""],get_cached:[6,1,1,""],get_namespace:[6,1,1,""],get_template:[6,1,1,""],include_file:[6,1,1,""],module:[6,0,1,""],template:[6,0,1,""],uri:[6,0,1,""]},"mako.runtime.TemplateNamespace":{filename:[6,0,1,""],module:[6,0,1,""],uri:[6,0,1,""]},"mako.template":{DefTemplate:[10,2,1,""],Template:[10,2,1,""]},"mako.template.Template":{code:[10,0,1,""],get_def:[10,1,1,""],render:[10,1,1,""],render_context:[10,1,1,""],render_unicode:[10,1,1,""],source:[10,0,1,""]},RichTraceback:{error:[10,0,1,""],lineno:[10,0,1,""],message:[10,0,1,""],records:[10,0,1,""],reverse_records:[10,0,1,""],reverse_traceback:[10,0,1,""],source:[10,0,1,""]}},objnames:{"0":["py","attribute","Python attribute"],"1":["py","method","Python method"],"2":["py","class","Python class"],"3":["py","function","Python function"]},objtypes:{"0":"py:attribute","1":"py:method","2":"py:class","3":"py:function"},terms:{"2to3":1,"5b1":1,"__builtin__":1,"__builtins__":1,"__class__":[1,10],"__file__":6,"__future__":[1,10],"__getattr__":1,"__html__":1,"__init__":0,"__len__":7,"__m_":1,"__m_local":9,"__name__":[0,1,10],"__nonzero__":1,"__str":9,"__str__":7,"__version__":1,"_cach":0,"_data":1,"_my_cache_work":0,"_pop_buff":1,"_pop_fram":1,"_push_buff":1,"_push_fram":1,"abstract":10,"boolean":10,"break":1,"byte":[1,9,10],"case":[0,1,2,3,5,6,7,8,9,10],"catch":1,"class":[0,1,2,5,6,7,9,10],"default":[0,1,2,3,5,6,7,8,9,10],"dr\u00f4le":9,"export":[2,5,8],"f\u00e9rotin":1,"final":[1,3,5,9],"function":[0,1,2,3,5,6,7,8,9,10],"import":[0,1,2,3,6,7,8,9,10],"int":7,"long":[1,7,8],"new":[0,1,2,3,5,7,8,10],"pla\u00eet":9,"r\u00e9veill\u00e9":9,"return":[0,1,2,3,6,7,8,9,10],"short":0,"static":[4,5],"super":[0,5,6,9],"switch":7,"throw":[0,7],"true":[0,1,2,3,6,7,8],"try":[1,3,7,8,9,10],"var":1,"while":[1,2,3,5,8,10],abil:[0,6,8,9,10],abl:7,about:[1,4],abov:[0,2,3,5,6,7,8,9,10],absolut:[1,2,9],accept:[0,1,3,6,7,8,9,10],accessor:[0,1,5,6],accommod:1,accompani:10,accomplish:[0,8,10],accord:1,accordingli:10,account:2,accountdata:2,accountnam:2,accumul:8,achiev:[2,5,7],acquir:[0,9],across:[0,7],act:[7,10],actual:[0,1,2,3,5,6,7,8,10],add:[2,3,5,10],addit:[0,1,2,3,5,6,8,10],addition:[1,5,9,10],address:[0,10],adjust:[1,6,8,10],adjust_uri:10,advanc:10,advantag:[5,6,9,10],affect:[1,7],afford:[1,10],after:[0,1,3,6,7,10],again:[2,7],against:[1,8,10],agre:5,akkerman:1,algorithm:1,all:[0,1,2,3,4,5,6],allow:[0,1,2,3,5,6,7,8,9,10],almost:[5,8],alon:1,along:[0,5,6],alor:9,alpha:1,alreadi:[1,5,7,10],also:[0,1,2,3,5,6,7,8,9,10],altern:[1,7,9,10],although:8,altogeth:1,alwai:[1,2,5,7,9],ani:[0,1,2,3,5,6,7,8,9,10],anonym:[0,1,2,8],anoth:[1,2,5,6,7,8,9,10],answer:1,anyth:[2,5,9],anywai:[1,10],anywher:[2,6,8],appar:[1,3,6],appear:[1,3,7,8,10],append:10,appli:[1,2,3,6,7,8,9,10],applic:[1,3,7,8,10],approach:[5,7,9],appropri:1,approxim:10,apr:1,aptli:10,arbitrari:[0,8],arbitrarili:[1,2],area:[2,5,7,8,9],aren:[1,2,9],arg1:6,arg2:6,arg3:6,arg4:6,arg:[0,1,2,3,6,8,10],argpars:1,arguabl:9,around:[1,3,7,10],arrai:3,arrang:8,ascii:[1,9],ask:7,aspect:[8,9],assign:[1,2,7,8,10],associ:[0,1,7],assum:[9,10],ast:[1,9],atom:10,attach:6,attempt:[0,1,9],attr:[1,5],attribut:[0,1,2,3,4],attributeerror:1,aug:1,augment:[2,4],author:7,automat:[0,2,3,5,7,8,10],avail:[0,1,2,3,5,6,7,8,9,10],avoid:1,awai:5,awar:[1,7,9,10],babel:1,babelplugin:10,back:[1,5,7,9,10],background:9,backslash:[1,8],backward:[0,1],bar:[1,2,3,6,7,8,10],bare:1,base:[0,1,3,4,5,6,7,8],basemost:5,basestr:1,basi:[0,5,7],basic:[1,2,4,6,8,9],batch:3,batcheld:1,beaker_cach:0,beakercacheimpl:0,bean:10,becam:1,becaus:[1,2,3,5,9],becom:[1,6,9,10],been:[0,1,3,6,9,10],befor:[0,1,3,5,6,8,9,10],began:7,begin:10,behav:2,behavior:[1,3,5,7,10],bell:9,below:[1,2,5,9],ben:1,benchmark:1,best:8,better:[0,1,7],between:[1,2,5,6,7],beyond:[0,2],binari:9,bit:[1,2,7,10],bitbucket:1,black:7,blank:[1,7],block:[0,1],blunt:0,board:7,bodi:[0,1,2,4,5],bold:3,bom:1,bool:7,bot:7,both:[1,2,3,5,7,9,10],bottom:1,bottommost:5,bound:1,breakag:1,breakdown:5,brief:10,broke:1,broken:1,buf:[3,10],buffer:1,buffer_filt:[1,10],buffet:1,bug:1,bugfix:1,build:[2,5,6],buildtabl:2,built:[1,2,3,4,5],builtin:[1,9],bump:1,bunch:6,burden:9,bye:2,bytestr:[1,10],bytestring_passthrough:[1,10],cache_:[0,1],cache_arg:[0,1,10],cache_dir:[0,1,10],cache_en:[0,1,10],cache_impl:[0,1,10],cache_kei:[0,1],cache_region:0,cache_timeout:[0,1,2],cache_typ:[0,1,8,10],cache_url:[0,1,10],cache_xyz:0,cacheabl:1,cacheimpl:[0,1,10],cachemanag:[0,1],calcul:10,call:[0,1],call_my_object:9,callabl:[0,1,2,3,6,7,8,10],callable_:[6,10],caller:[1,2,3,6,7],caller_stack:[1,6,9],calling_uri:6,callstack:7,came:1,camp:1,can:[0,1,2,3,5,6,7,8,9,10],cannot:[1,2,9,10],cant:1,capabl:[0,1,10],captur:[1,3,6,7,10],care:[0,6,7,9],catalog:10,categori:6,caught:10,caus:[1,3,6,7,10],cazabon:1,central:[2,3,7,8],certain:[1,3,6,9,10],cfg:[1,10],cgi:[1,3,9],chain:[1,5,6,7,8],chang:[0,1,5,7,9],chapter:[2,3,4,5],charact:[1,8,9,10],characterist:8,charl:1,check:[1,5,7,8,9],checker:7,cheetah:9,child:5,choos:9,chosen:0,clarifi:1,class_:5,classic:[6,8],clean:[0,1,10],cleaner:7,close:[1,2,6,8,10],closur:2,cmd:1,cmdline:1,code:[1,2,3,6,7,8,9,10],codebas:1,codec:[9,10],codegen:1,codi:1,coerc:9,col:2,collect:[0,1,6,7,9],collection_s:10,collis:1,colomiet:1,colon:[0,8],column:2,combin:[1,7],come:[0,2,5,8,9,10],comma:[2,3,10],command:[1,10],comment:[1,4],common:[1,4,5,6,9],commonli:[0,5,9],commun:[2,7],comp1:6,comp2:6,comp:6,compar:[9,10],compat:[0,1,6,10],compil:[0,1,7,8,10],compileexcept:1,complet:[1,5,6,10],compliant:9,compon:[0,6,7],comprehens:1,concaten:[3,10],conceiv:7,concept:[2,8,10],condit:[1,2,5,8],condition:[1,6],configur:[0,1,5,6,10],conflict:0,conform:1,confus:[5,9],conjunct:[1,5,10],consid:[1,7,10],consist:8,consol:9,conson:7,constant:7,construct:[0,1,2,5,6,8,9,10],constructor:1,consum:[0,1,8],contain:[0,1,2,6,8,9,10],content:[0,1],context:[0,1,2,3,4,5,6],contextu:2,contigu:8,continu:[1,8,9,10],contrast:[2,5,9],contrib:1,contribut:1,contriv:10,control:[1,2,3,4,5,7],convei:10,conveni:0,convent:[2,6],convers:[1,9],convert:[0,1,9,10],convert_com:1,copi:[1,6,7],core:1,correct:[1,6],correctli:[1,7],correspond:[0,5,6,7,10],corrupt:1,could:[1,5],couldn:1,count:[2,7,10],coupl:1,cours:[1,7],courtesi:1,cover:1,coverag:1,creat:[0,1,2,6,7,8,9,10],creation:[0,1,2,3,10],creation_funct:0,critic:1,crlf:1,cross:1,css:[1,6,10],cstringio:[1,9,10],ctx:10,current:[1,2,5,6,7,8,10],current_sect:8,custom:[1,2,3,5,6,8,9,10],dairiki:1,daniel:1,data:[0,1,2,6,7,9,10],databas:2,date:1,daverio:1,dbm:0,deal:[7,8,9],dealt:10,dec:1,decid:[7,8],decis:[5,7,9],declar:[1,2,3,4,5],decod:[1,3,9],decor:1,decreas:6,deepli:2,def:[0,1],default_filt:1,defin:[1,2,3,4,5,6,7,8],definit:[2,3,5,6],defnam:[1,2],deftempl:[2,10],delai:1,deliv:[1,3,6],delta:6,demarc:2,denot:8,depend:[1,4],deploy:1,deprec:[1,10],depth:7,derek:1,deriv:[0,1,3,9],describ:[1,2,3,5,6,7,8,9,10],descript:10,descriptor:1,design:3,desir:[1,6,9,10],despit:1,dessin:9,dest:10,destin:10,detail:[2,5,7,8,9,10],detect:1,determin:[0,1,9],determinist:3,develop:9,dict:[1,9],dictionari:[0,1,6,7,10],did:[1,5],differ:[0,1,2,5,6,7,10],differenti:7,dir:[0,1,10],direct:[0,2,6,8,10],directli:[0,1,2,3,6,8,10],directori:[0,1,3,7,9,10],dirnam:10,disabl:[0,1,3,4,7],disable_unicod:[1,3],disait:9,disallow:1,discard:3,discuss:1,disgard:9,displai:[1,10],disregard:10,distinct:[1,10],distinctli:5,distribut:10,distutil:10,div:[2,5,6,10],divis:10,do_something_speci:0,doc:[1,2,7],document:[0,1,5,8,9,10],doe:[1,2,5,6,7,8,9],doesn:[1,2,5,6,7],don:[0,1,2,5,7,9],done:[9,10],dot:1,doubli:1,down:[0,1,9],dragon:1,draw:3,drive:1,drop:[1,8],due:1,dumb:9,dump:[6,9],dure:[1,5,10],dyn:6,dynam:[1,5,8],each:[0,1,2,5,6,7,8,9,10],earli:[1,4],earlier:[0,9],eas:[3,7],easi:[3,7],easier:0,edgewal:1,eeve:1,effect:[0,1,2,3,6,10],egg:7,either:[0,1,5,7,8,9,10],elabor:1,elem:8,element:[1,2,5,7,8,9,10],elif:8,elimin:9,ell:9,els:[0,1,7,8,10],emac:1,email:8,emb:[6,8,9],embed:1,emit:[1,8],empti:[1,3,8,9],enabl:[0,1,7,8,10],enable_loop:[1,7,10],enclos:[2,7],encod:[1,3,4],encoding_error:[1,9,10],encount:[1,5],end:[1,3,5,8],endfor:[2,6,7,8],endif:[1,2,6,7,8],endless:1,endwith:1,enforc:1,enorm:2,ensur:[0,1,6,9],entir:[2,3,4,5,6,8],entiti:[1,3],entri:[0,1,10],entrypoint:[0,1],enumer:7,environ:[1,3,4],epoch:0,equival:[0,2,3,6,8,9],eric:1,errant:1,error:[1,2,7,9,10],error_handl:[1,10],escap:[1,2,3,4],essenti:[0,6,9],establish:[1,7,10],etc:[0,1,2,6,7,8,10],eval:1,evalu:[1,2,6,8],evaul:1,even:[1,5,7,8,9],ever:[6,9],everi:[1,6,8],everyon:7,everyth:[1,7],exactli:[2,5],examin:6,exampl:[0,1,2,3,4,5],exc:1,exc_info:[1,10],exceed:7,except:[0,1,2,3,4,6,7,8],excerpt:10,exclus:10,exec:1,execut:[0,1,2,3,5,6,7,8,10],exist:[0,1,2,6,7,8,9,10],exit:[1,4],expand:1,expect:[1,2,5,7,8,9],experienc:7,expir:[0,1],expiri:1,explcitli:1,explicit:[0,1,2,6,7,8,9],explicitli:[1,5,6,7,9,10],expr:[1,2,6],express:[1,2],expression_filt:[1,3],ext:[0,1,10],extens:1,extern:[0,2,5],extra:[1,5,8],extract:[1,10],extractor:[1,10],facad:0,facet:7,facil:5,fact:[2,5,9],fail:1,failur:7,fake:8,fall:0,fals:[0,1,7,10],familiar:[2,8],far:[1,5,8,9,10],fashion:0,fast:10,fastencodingbuff:[1,9],faster:[1,9],featur:[0,1,5,7,8,10],feb:1,few:[1,7],field:10,file:[0,1],filehandl:[1,9],filenam:[0,1,6,10],filename_to_uri:10,filesystem:[0,1,6],filesystem_check:10,filter:[1,2],find:[7,8,10],finish:5,first:[0,1,3,5,6,7,8,9,10],five:[0,8],fix:[0,1,6,10],flag:[0,1,3,6,7,8,9,10],flexibl:[3,5,8],flip:2,flow:8,fly:9,follow:[1,2,5,6,7,8,10],foo:[1,2,3,6,7,8,9,10],footer:[5,8],forc:[1,10],form:[1,2,6,8],format:[1,2,6,8,9,10],format_except:[1,10],formatt:1,former:1,forward:1,found:[1,2,7,8],four:[6,8],fragment:1,frame:1,framework:4,francoi:10,free:[1,6],freeli:7,fri:1,frobnizzl:8,from:[0,1],frozenset:1,full:[1,8,10],fulli:[1,3,5,10],func:6,further:[1,8],futur:[6,8],future_import:[1,10],futures_import:10,fyi:1,gae:1,game:9,garbag:0,gather:9,gave:10,geisler:1,gener:[0,1,2,3,5,6,7,8,9,10],genshi:8,georg:1,get:[0,1,3,5,6,7,8,9,10],get_cach:6,get_def:[1,2,3,10],get_namespac:[1,6],get_or_cr:[0,1],get_resourc:8,get_templ:[0,6,9,10],getargspec:1,getattr:6,getdefaultencod:1,gettext:[1,10],getvalu:[3,10],github:1,give:[2,6],given:[0,1,2,3,5,6,7,10],global:[0,2,5,6,7],glyph:1,goal:[1,3],goe:8,good:[0,1,8],got:1,graphic:9,great:[6,9],grei:5,group:[0,1,6],guess:[1,9],guest:1,guid:10,hack:[1,7],had:[1,9],hadn:1,haltner:1,ham:7,hand:5,handi:6,handl:[0,1,2,4,7,8],handler:[1,10],happen:[6,7,9],hard:[5,7,8,9],harland:1,has_templ:10,hasattr:6,hash:1,have:[0,1,2,3,5,6,7,8,9,10],head:[2,5,6,10],header:[0,1,2,5,8,10],heavili:9,heck:4,hello:[2,6,8,9,10],help:[0,1,9,10],helper:10,her:9,here:[0,1,3,5,6,7,8,9,10],highlight:[1,10],hit:[3,9],hold:6,home:1,honor:1,hopefulli:1,how:[1,2,6,7,8,10],howev:[1,2,5,6,9],href:[2,6],htdoc:10,html:[0,1,2,3,5,6,8,9,10],html_error_templ:[1,10],html_escap:1,htmlentitydef:3,htmlentityreplac:[1,10],http:1,hypothet:5,idea:[1,5,8],ideal:1,ident:[1,6,10],identifi:[0,1,8,10],ignor:[7,8],illus:9,illustr:[3,5,10],imag:[9,10],imaginez:9,immedi:[1,5,7,8,9,10],immut:7,impl:0,implement:[0,1,2,5,10],impli:10,implic:9,implicit:[0,7],implicitli:1,improv:[1,8,9,10],incl:6,includ:[0,1,2,4],include_fil:[1,6],incom:9,incompat:1,incorrect:1,increas:10,indent:[1,8],index:[1,4,5,6,7,8,10],indic:[0,1],individu:[0,1,2,7,10],info:[1,10],inform:[1,6,8,9,10],inher:3,inherit:[0,1,2,4],initi:[1,2],inject:10,inlin:[1,5,7,8],inner:[1,2],input:[1,2,3,9],input_encod:[1,9,10],insensit:1,insert:[5,10],insid:[0,1,2,5,6,8,10],inspect:1,inspir:8,instal:[0,1],install_requir:1,instanc:[6,7,8,10],instead:[1,2,3,5,6,9,10],insur:1,integ:[0,2,9],integr:[0,1,4,5],intellig:9,intend:[1,3,6],intent:3,interact:[5,6,9],interchang:5,interest:10,interfac:0,intermedi:5,intermix:5,intern:[0,1,3,7,9,10],interpret:[1,2,9,10],interven:1,intro:2,introduc:[2,5,6,7,8],invalid:[0,1],invalidate_bodi:[0,1],invalidate_closur:[0,1],invalidate_def:[0,1],invoc:5,invok:[2,5,8,10],involv:[1,5],ioerror:1,iou:7,isn:[1,7],issu:[1,2,9,10],item:[2,7,8],iter:[2,6],itself:[0,1,2,3,5,6,7,8,9,10],jack:10,jan:1,javascript:6,jeff:1,jinja2:[1,2,8],jinja:1,jit:7,job:3,joe:8,john:2,join:9,jot:7,jour:9,json:1,jsp:8,jul:1,jun:1,just:[1,2,3,5,6,7,8,9,10],jut:7,jython:1,keep:2,kei:[0,1,5,6,7,9,10],keyerror:7,keyword:[1,2,5,6,7,8,9,10],kind:[0,3,5,6,7,8,9,10],know:[5,9],known:[1,2,6],kwarg:[0,1,6,7,10],lack:1,lai:2,lambda:1,languag:[2,8,9],larg:[1,5],last:[1,7,10],last_modifi:1,later:[0,8],latest:1,latter:[1,9],laurent:1,layout:[1,2,5,6,10],layoutdata:2,lead:[1,3,6,7],learn:9,least:[6,10],left:[3,10],leftmost:3,legaci:1,legacy_html_escap:1,legendari:1,len:8,less:[1,5,7,9],let:[1,2,5,7,10],level:[0,1,2,3,4,5,6,7],lever:9,leverag:8,lex:1,lexer:[1,8,9,10],lexer_cl:[1,10],lib:1,librari:[0,2,3,6,9,10],lieu:10,lift:5,lighter:1,like:[0,1,2,3,5,6,7,8,9,10],line:[1,5,8,9,10],lineno:10,lingua:1,link:[6,10],linkag:5,list:[0,1,2,3,5,7,8,9,10],lister:2,liter:[1,6,9,10],littl:[1,2,7,10],live:0,load:[6,8,10],load_templ:1,loader:1,local:[0,1,2,3],locals_:1,locat:[1,6,7,9,10],lock:0,logic:[1,3],long_term:0,longer:1,look:[0,1,2,5,6,7,9,10],lookup:[0,1,7,9,10],loop:[1,2,4],loopcontext:7,lopez:1,lost:1,lot:[1,8],lower:1,made:[0,1,7],magamedov:1,magic:[1,7,9],mai:[0,1,3,6,7,8,9,10],main:[1,2,3,5,6,7,9,10],mainlayout:[2,5],mainli:[1,6],maintain:[0,1,10],major:[1,7,9],mak:1,make:[0,1,2,3,5,6,7,8,9,10],mako:[0,1,2,3,4,5,6],mako_cach:0,mako_modul:10,manag:[0,1,7],manfr:1,mani:[1,7,8],manner:3,manual:10,map:[1,10],mar:1,markedli:9,marker:[1,8],markupsaf:[1,3,9],martin:1,matter:5,maxim:[0,9],maximum:1,mayb:5,mean:[0,1,2,3,5,6,7,8,9,10],meant:5,mechan:[0,5,8],member:[7,8,10],memcach:[0,1],memori:[0,1,8,10],mention:9,merg:1,mess:1,messag:[1,7,10],met:2,metadata:[1,8],metaphor:5,method:[0,1,2,3,4,5],middl:[3,5,8],might:[5,6,7,8],migrat:1,mimic:10,mini:7,minim:0,minor:10,minu:[0,1],minut:0,mirror:10,miss:[1,3,7,10],mistak:5,mix:1,mkstemp:10,mode:[1,9],model:2,moder:10,modern:[0,1],modifi:[1,2,5,9,10],modul:[0,1,2,3,4,5],module_directori:[0,1,10],module_filenam:[1,10],module_writ:[1,10],modulenam:0,modulename_cal:[1,10],modulenamespac:6,modulepath:0,moduletempl:1,moi:9,moment:10,mon:1,more:[0,1,2,3,5,6,7,8,9,10],most:[0,1,2,5,6,7,8,9,10],mostli:[0,1,6,7,10],mouton:9,move:10,msgid:10,msgstr:10,much:[1,2,5,8,9],multi:1,multibyt:[1,10],multilin:[1,8],multipl:[0,1,2,4],multithread:0,must:[0,1,2,5,6,9,10],mutual:10,my_tag:6,mycomp:0,mydef:2,myescap:3,myexpress:3,myfil:8,myfilt:[1,3],myfunc:8,myghti:9,myghtyutil:1,mylib:8,mylookup:[9,10],myn:1,mynamespac:[6,8],mypackag:3,myproj:10,mystuff:2,mystyl:6,mytag:6,mytempl:[0,1,9,10],mytmpl:10,name:[0,1],nameerror:[1,7,10],namespac:[0,1,2,3,4],namespace_nam:6,namespacenam:[1,2,8],nari:9,nativ:9,natur:3,necessarili:7,ned:1,need:[0,1,2,5,6,7,9,10],neither:0,nest:[0,1,2,3,4],nestabl:2,never:1,newer:[2,10],newli:0,newlin:[1,4],next:[0,2,3,4],nightmar:9,ninja:5,node:1,non:[1,7,8,9,10],none:[0,1,3,6,7,8,10],normal:[1,2,3,7,8,9,10],nose:1,note:[0,1,2,3,5,6,7,9,10],noth:5,notic:2,notimplementederror:10,notion:7,nov:1,now:[1,5,7,8,9],number:[0,1,2,7,8,10],numer:8,nutshel:5,object:[0,1,2,3,5,6,7,8,9,10],objnam:0,observ:1,obsolet:1,obvious:5,occlud:1,occur:[0,1,2,10],oct:1,odd:[1,7],off:[0,1,2],offer:[8,9],often:[5,6],old:[1,7],onc:[2,5,7,8],ongo:1,onli:[0,1,2,3,5,7,8,9,10],onto:[7,8],open:[5,8,9],oper:[1,2,3,6,7,8,9,10],opposit:5,opt:[0,1,10],optim:1,option:[0,1,6,7,8,9,10],optpars:1,order:[0,1,5,8,9,10],ordinari:6,org:1,organ:[5,6],orient:[2,5],origin:[0,1,3,6,7,9,10],other:[0,1],otherwis:[1,7,8,9,10],our:[0,1,2,5,10],out:[0,1,2,5,8,9,10],outer:2,output:[1,2,3,4,5,6,7,8],output_encod:[1,9,10],outputpath:10,outsid:[1,2,5,6,7,9],outward:10,over:[1,3,6,7],overhead:[1,9],overrid:[0,1,5,6,7,9,10],overridden:[0,2,5,6],overrod:5,overwritten:0,own:[0,1,2,3,5,6,7,8,9,10],pack:1,packag:[0,1,8],page:[0,1],pagearg:[1,2,6,7,9],pagecontrol:2,paradigm:5,param:8,paramet:[0,1,6,9,10],parent:[0,1,2,4],pariti:7,pars:[1,8,9,10],parseabl:1,part:[0,1,5,6,7],parti:0,partial:[1,5],particip:5,particular:[0,1,5,6,7,10],particularli:[1,6],pass:[0,1,2,5,6,7,8,9,10],pass_context:[0,1],passthru:1,patch:1,path:[0,1,6,10],pathnam:1,pattern:10,paul:1,pbj:7,penalti:1,peopl:1,pep:[1,9],per:[0,1,5,7,8,9],percent:[1,8],percentag:10,perform:[1,3,6,9,10],perhap:[2,7,8],perl:8,perm:1,perman:1,permiss:[1,10],persist:[0,1],petit:9,phase:10,philosophi:7,picki:9,pinard:10,pipe:3,pit:7,pkg_resourc:[0,1],place:[0,1,2,5,8,10],plai:[6,9],plain:[1,2,6,8,9,10],platform:10,pleas:8,plu:[1,10],plug:0,point:[0,1,2,5,6,8,9,10],polymorph:8,pop:[0,3,7],pop_buff:3,pop_cal:7,pop_fram:9,popul:0,popular:10,populate_self:6,portabl:2,portion:[1,2],posit:6,possibl:[0,2,3,7],post:[2,10],post_pros:2,pot:7,potenti:5,pow:8,power:8,practic:[1,5],pre:[1,10],preambl:10,preced:[5,6,8,9,10],precompil:1,predefin:1,prefer:[1,9],prefix:[0,1,7],prep:7,prepend:1,preprocessor:[1,10],presenc:1,present:[0,1,2,5,6,7,9,10],preserv:1,pretti:[8,9],prevent:[1,8],previou:[1,2,5,6,7,10],previous:[1,6,10],primari:10,primarili:7,print:[2,9,10],printabl:9,prior:[3,7,9],privat:1,probabl:[0,1,2,7,10],procedur:0,process:[0,1,5,8,9],produc:[1,2,3,4],product:10,program:[8,9],programat:10,programm:9,progress:7,project:10,propag:[1,7,8,10],proper:10,properli:[1,9],properti:[1,6,10],propig:1,provid:[0,1,2,3,5,6,7,8,10],proxi:6,prune:1,pull:[1,2,6,7,10],pullreq:1,pure:[1,6,8,9],purpos:[1,7,8,9,10],push:7,push_buff:3,push_cal:7,push_fram:9,put:[0,1,5,6,7],put_str:10,put_templ:10,py2:1,py2k:1,py3k:1,pybabel:10,pygment:1,pygmentplugin:10,pylon:[1,10],pypars:1,pyramid:1,pythagorean:8,python3:1,python:[1,2,3,4,5],quand:9,quick:[1,2,8],quickli:9,quot:[1,9],quote_plu:3,rais:[1,2,7,9,10],rang:[1,2,8],rather:[1,7],raw:[1,9,10],reach:[7,10],read:[7,8,9],readm:1,real:[1,8,10],realli:[1,9],ream:9,reason:[7,9],recal:5,receiv:[1,2,3,6,8],recent:10,recogn:[5,6],recommend:[1,6],recompil:[0,1,10],record:[6,8,10],recurs:1,red:7,reduc:3,reduct:1,referenc:[1,2,5,6,7],refresh:1,regard:[1,9],regardless:[1,2,5,7],regener:[1,10],regexp:1,region:[0,1],regist:[0,1],register_plugin:[0,1],regress:1,regular:[1,2,3,4,5],rel:[1,6,10],relat:[0,1,9,10],relationship:6,relativeto:10,releas:[0,1,6,8],reli:1,reload:10,remain:[1,2,7],remot:[2,6],remov:[1,6,9],render:[0,1,2,3,4],render_:7,render_bodi:[3,7,9,10],render_context:10,render_mydef:7,render_unicod:[1,9,10],reopen:1,repair:1,replac:[0,1,3,9,10],repons:6,report:[1,10],repres:[0,1,2,7,8,9,10],represent:[1,8,10],request:[0,1,6,7,10],requir:[0,1,2,6,8,9],requset:1,reserv:1,reserved_nam:1,reset:1,resolut:[5,6,10],resolv:[1,10],resourc:[1,5,10],respect:8,respons:[0,5,7],rest:[0,5,8],restrict:[1,2,5],result:[1,2,3,5,7,8,10],retriev:0,revers:10,reverse_index:7,reverse_record:10,reverse_traceback:10,revis:10,rework:1,rewrot:1,richtraceback:[1,10],right:[1,2,3,7,8,9],role:6,root:[1,10],roughli:8,routin:10,row:2,rudiment:[0,10],rule:[1,2,5],run:[1,5,6,7,9,10],run_wsgi:[1,10],runner:[1,10],runtim:[0,1,3,4,5,6],runtimeerror:1,safe:[7,9],sai:[1,2,4,5,7],sake:3,same:[0,1,2,5,6,7,8,9,10],sampl:10,sane:2,sat:1,scaffold:6,scalar:[1,6],scenario:[1,2,5,6,7,10],scheme:[1,2,6,7,9,10],scope:[0,1,2,5,6,7,8],scott:1,script:[1,6],search:[4,10],second:[0,2,3],section:[0,1,2,5,6,7,10],sectiona:5,secur:1,see:[0,1,2,6,7,8,9,10],seem:1,segment:9,select:5,selector:1,self:[0,1,2,5],semant:[1,2,5,8],semi:0,send:[1,3,5,6,7,9,10],sens:7,sent:[1,3,6,7,8],sep:1,separ:[0,1,2,3,5,10],seri:[0,1,9,10],serious:5,serv:[8,9,10],serve_templ:10,server:[0,8,10],servic:[0,8,9],set:[0,1,3,6,7,8,9],setup:[0,1,5,10],setuptool:[0,1,10],sever:[1,6],shall:5,share:[1,2,7],sharp:2,shell:1,shop:7,short_term:0,should:[0,1,6,7,10],shouldn:7,shutil:10,side:[1,2,3,8],sidebar:2,sign:[1,8],signatur:[1,2,6],signific:[7,8],silent:[1,7],similar:[2,3,5,6,7,8,9,10],similarli:[2,9],simpl:[0,2,7,8,10],simplecacheimpl:0,simpler:1,simplest:8,simpli:[3,5],simplic:3,simplifi:1,sinc:[1,2,5,6,7,9,10],singl:[0,1,2,3,5,8,9,10],singleton:7,skip:[1,10],slain:1,slash:[1,6,8],slight:1,slightli:[6,9],slim:0,slowdown:1,slower:9,small:[1,10],smoothli:5,some:[0,1,2,3,5,6,7,8,9,10],some_cal:1,some_condit:2,some_namespac:6,some_other_directori:1,some_tag:1,some_templ:[1,10],somedata:2,somedef:[0,1,2,3,6,8],someencod:1,somefil:[1,6],somefunct:6,somekei:[0,1],somemodul:1,someobject:6,sometempl:0,someth:[2,3,9],sometim:[1,5,8],somev:[6,7],somevalu:0,somewhat:[2,3],somewher:[7,9,10],sophist:5,sound:[5,8],sourc:[1,5,8,9,10],space:[0,1,2,8],spam:7,span:[2,5],special:[0,1,3,7,8,10],specifi:[0,1,3,4,5,7],speed:[1,3,9],speedup:1,sphinx:1,src:6,stack:[1,3,7,10],stacktrac:1,stage:10,stai:[0,7],standalon:[1,10],standard:[0,1,9],start:[0,2],starttim:0,startup:1,state:[1,2,5,7,9],statement:[1,2,8,10],stdout:[1,10],step:[1,2,9,10],stick:[1,2,7,8,9],still:[1,2,5,9],stop:[7,8],stop_rend:[1,8],storag:[1,9],store:[0,1,3,7,9,10],str:[1,3,7,9,10],straight:[1,9,10],strategi:0,stream:[1,6,7,8,9,10],streamlin:5,strict:10,strict_undefin:[1,7,10],strictli:[1,9],string:[0,1,3,6,7,8,9,10],stringifi:1,stringio:[1,7,9,10],strip:[1,3],stripe:7,structur:[1,4,5,7],stuff:[6,8],style:[1,2,9],stylesheet:[6,10],sub:[2,8],subclass:[0,2,10],subcompon:2,subdef:2,subdirectori:1,subject:1,subsequ:0,substitut:[3,4,7],succe:1,success:10,suggest:1,suit:[1,5],summari:8,sun:1,supersed:[0,1],suppli:[1,6,8],support:[0,1,2,6,8,9,10],supports_cal:[1,6],suppos:[0,2],sure:[1,8],surpris:9,surround:[1,8],suspend:8,svn:1,swap:0,symbol:[1,8],synchron:1,synonym:[0,1,6],syntact:8,syntax:[1,2,3,4],system:[0,1,2,5,7,10],tabl:[1,2],tack:6,tag:[0,1,2,3,4,5,6,7],tagfilt:3,tailor:2,take:[1,2,3,5,6,8,9],taken:[0,1,6,10],target:[1,2,3],task:0,taylor:1,techniqu:7,techspot:1,tell:8,tempfil:[1,10],templat:[0,1,2,3,4],templatecollect:10,templatelookup:[0,1,3,4,6,7,9],templatelookupexcept:10,templatenam:10,templatenamespac:6,templatetext:[3,9],templateuri:6,temporari:1,temporarili:1,term:0,test:1,text:[0,1,2,3,6,7],text_error_templ:[1,10],textmat:1,textual:[3,5,10],tgplugin:1,than:[0,1,3,5,7,8,9],thank:1,thei:[1,2,3,5,7,8,9,10],them:[1,2,3,5,6,7,10],themselv:[0,2,5,6,7,8],theorem:8,therebi:6,therefor:[5,6,8,10],thereof:1,thi:[0,1,2,3,5,6,7,8,9,10],thing:[1,2,5,7,8,9],think:7,third:0,those:[0,1,2,6,7,8,10],though:[0,1,5,7,9],thread:0,threadsaf:0,three:[7,8],through:[1,6,7,9,10],throughout:[1,6],thrown:[0,10],thu:[1,10],time:[0,1,2,3,4],timeout:[0,1],timestamp:0,tinker:1,titl:[2,5,8],tmbundl:1,tmp:[3,10],togeth:[5,6],token:1,too:[1,3,5],tool:[0,1],toolbar:[5,8],top:[0,1,2,3,5,6,7],toplevellookupexcept:1,toplevelnotfound:10,topmost:[5,6,7,8],torborg:1,toscawidget:1,touch:1,toward:[2,5],trace:[1,10],traceback:[1,10],tracelin:10,track:[1,7],trail:3,transform:3,transit:7,translat:[1,10],transpar:7,travers:6,treat:[1,9],treatment:9,tri:[2,7,10],trim:[1,3,8],trofatt:1,tryexcept:1,tue:1,tupl:[1,10],turbogear:1,turn:1,twist:2,two:[0,1,2,3,5],txt:[8,9,10],type:[0,1,2,6,7,8,9,10],typeerror:[1,7],typic:[0,10],ultim:[1,5,6],umask:1,unbound:10,unbuff:3,unclos:1,uncommon:1,uncondition:9,undeclar:[1,10],undefin:[1,2,7,8,10],under:[0,1,9,10],underli:[0,2,3,5,6,7,8,10],underneath:0,underscor:1,understand:[5,9],understood:0,unescap:1,unexplain:1,unicod:[1,3,4],uniniti:7,uniqu:[0,5,7],unit:1,univers:1,unknown:1,unless:[7,9],unlik:9,unreach:2,until:[1,10],unusu:10,updat:[1,10],upon:[0,1,2,3,5,10],uri:[1,6,8,10],url:[0,1,3,8,10],urllib:3,usabl:2,usag:[0,1,2,3,4,5],use_pag:3,user:[1,7,8,9,10],userbas:9,usernam:[2,8],usual:[0,1,3,7,8,10],utf8:[3,9],utf:[1,3,9,10],util:10,valid:8,valu:[0,1,2,3,6,7,8,9,10],variabl:[1,2,5,6],variant:[1,8],varieti:[0,6,8],variou:[1,3,6,7,8,9,10],vast:9,veri:[0,1,2,5,10],version:0,versu:[1,6,10],via:[0,1,2,5,6,7,8,9,10],view:10,vincent:1,vladimir:1,voix:9,vou:9,vowel:7,wai:[0,1,2,3,4,5],walkthrough:2,want:[0,2,3,5,6,7,8,9],warn:1,wasn:[1,5,7],web:10,wed:1,weight:1,welcom:1,well:[0,1,2,3,5,6,7,8,9,10],were:[1,5,6,7,9],what:[1,2,4],whatev:[1,6,7,9,10],whatsoev:[1,9],wheel:1,when:[0,1,2,3,5,6,7,8,9,10],whenev:[5,9,10],where:[0,1,2,3,5,6,7,8,9,10],wherea:[2,7,8,9],wherebi:1,wherev:9,whether:[1,3,7,8],which:[0,1,2,3,5,6,7,8,9,10],white:[1,5],whitespac:[1,2,3,8],who:[1,9],whole:[2,3,5,6],whoop:1,why:7,wichert:1,widget:2,window:1,wise:1,wish:[0,3,7],within:[0,1],without:[0,1,5,6,7],won:[5,7,10],wonder:8,word:5,work:[0,1,2,3,5,6,7,9,10],world:[2,6,7,8,9,10],woroshow:1,would:[0,1,2,3,5,7,9,10],wouldn:[6,8],wrap:[1,2,4],wrapper:3,writer:7,written:[1,5,8,10],wsgi:1,wsgiutil:10,x80:9,x99a:9,xa9:9,xa9veil:9,xb4le:9,xc3:9,xe2:9,xie:1,xml:[1,3,8,10],year:1,yet:[0,1,6],ymmv:1,you:[0,1,2,3,5,6,7,8,9,10],your:[1,2,3,5,6,7,8],yourself:[9,10],zebra:7,zer0:1,zero:1,zzzeek:1},titles:["Caching","Changelog","Defs and Blocks","Filtering and Buffering","Table of Contents","Inheritance","Namespaces","The Mako Runtime Environment","Syntax","The Unicode Chapter","Usage"],titleterms:{"static":6,"true":9,about:5,access:0,accessor:7,all:7,api:[0,6,7,10],argument:[0,2,3],attr:6,attribut:5,augment:5,babel:10,backend:0,base:10,basic:10,beaker:0,block:[2,3,5,8],bodi:6,buffer:[3,7,9],built:[6,7],cach:0,call:[2,6,8],changelog:1,chapter:9,check:10,collect:10,comment:8,common:10,content:[2,4,5],context:[7,8],control:8,cycl:7,declar:6,decor:3,def:[2,3,5,6,8],default_filt:3,defin:9,defnam:8,depend:6,disabl:9,disable_unicod:9,doc:8,dogpil:0,earli:8,embed:2,encod:[9,10],entir:9,environ:7,escap:8,exampl:6,except:10,exit:8,express:[3,8,9],file:[2,9,10],filesystem:10,filter:[3,8],framework:10,from:[2,6,8],guidelin:0,handl:[9,10],heck:9,includ:[5,8],indic:4,inherit:[5,6,8],integr:10,iter:7,legaci:7,level:8,local:6,loop:[7,8],mako:7,method:[6,7],migrat:7,modul:[6,8],multipl:5,name:[2,5,6,7],namespac:[5,6,8],nest:5,newlin:8,next:5,nsname:8,off:3,older:1,other:2,output:9,page:[2,8],parent:[5,7],plugin:0,produc:5,programmat:[0,2],pygment:10,python:[6,8],refer:[0,6,7,10],regular:6,render:5,reserv:7,rule:9,runtim:7,sai:9,select:9,self:6,set:10,size:10,specif:[0,6],specifi:9,structur:8,substitut:8,syntax:8,tabl:4,tag:8,templat:[5,7,8,9,10],templatelookup:10,text:8,time:5,turn:3,two:6,unicod:[9,10],usag:[6,9,10],variabl:7,version:[1,6],wai:6,what:5,within:2,word:7,wrap:5,write:0,wsgi:10}}) \ No newline at end of file +Search.setIndex({envversion:46,filenames:["caching","changelog","defs","filtering","index","inheritance","namespaces","runtime","syntax","unicode","usage"],objects:{"mako.cache":{Cache:[0,2,1,""],CacheImpl:[0,2,1,""],register_plugin:[0,3,1,""]},"mako.cache.Cache":{get:[0,1,1,""],get_or_create:[0,1,1,""],id:[0,0,1,""],impl:[0,0,1,""],invalidate:[0,1,1,""],invalidate_body:[0,1,1,""],invalidate_closure:[0,1,1,""],invalidate_def:[0,1,1,""],put:[0,1,1,""],set:[0,1,1,""],starttime:[0,0,1,""]},"mako.cache.CacheImpl":{get:[0,1,1,""],get_or_create:[0,1,1,""],invalidate:[0,1,1,""],pass_context:[0,0,1,""],set:[0,1,1,""]},"mako.exceptions":{RichTraceback:[10,2,1,""],html_error_template:[10,3,1,""],text_error_template:[10,3,1,""]},"mako.ext.beaker_cache":{BeakerCacheImpl:[0,2,1,""]},"mako.lookup":{TemplateCollection:[10,2,1,""],TemplateLookup:[10,2,1,""]},"mako.lookup.TemplateCollection":{adjust_uri:[10,1,1,""],filename_to_uri:[10,1,1,""],get_template:[10,1,1,""],has_template:[10,1,1,""]},"mako.lookup.TemplateLookup":{adjust_uri:[10,1,1,""],filename_to_uri:[10,1,1,""],get_template:[10,1,1,""],put_string:[10,1,1,""],put_template:[10,1,1,""]},"mako.runtime":{Context:[7,2,1,""],LoopContext:[7,2,1,""],ModuleNamespace:[6,2,1,""],Namespace:[6,2,1,""],TemplateNamespace:[6,2,1,""],Undefined:[7,2,1,""],capture:[6,3,1,""],supports_caller:[6,3,1,""]},"mako.runtime.Context":{get:[7,1,1,""],keys:[7,1,1,""],kwargs:[7,0,1,""],lookup:[7,0,1,""],pop_caller:[7,1,1,""],push_caller:[7,1,1,""],write:[7,1,1,""],writer:[7,1,1,""]},"mako.runtime.LoopContext":{cycle:[7,1,1,""]},"mako.runtime.ModuleNamespace":{filename:[6,0,1,""]},"mako.runtime.Namespace":{attr:[6,0,1,""],cache:[6,0,1,""],context:[6,0,1,""],filename:[6,0,1,""],get_cached:[6,1,1,""],get_namespace:[6,1,1,""],get_template:[6,1,1,""],include_file:[6,1,1,""],module:[6,0,1,""],template:[6,0,1,""],uri:[6,0,1,""]},"mako.runtime.TemplateNamespace":{filename:[6,0,1,""],module:[6,0,1,""],uri:[6,0,1,""]},"mako.template":{DefTemplate:[10,2,1,""],Template:[10,2,1,""]},"mako.template.Template":{code:[10,0,1,""],get_def:[10,1,1,""],render:[10,1,1,""],render_context:[10,1,1,""],render_unicode:[10,1,1,""],source:[10,0,1,""]},RichTraceback:{error:[10,0,1,""],lineno:[10,0,1,""],message:[10,0,1,""],records:[10,0,1,""],reverse_records:[10,0,1,""],reverse_traceback:[10,0,1,""],source:[10,0,1,""]}},objnames:{"0":["py","attribute","Python attribute"],"1":["py","method","Python method"],"2":["py","class","Python class"],"3":["py","function","Python function"]},objtypes:{"0":"py:attribute","1":"py:method","2":"py:class","3":"py:function"},terms:{"2to3":1,"5b1":1,"__builtin__":1,"__builtins__":1,"__class__":[1,10],"__file__":6,"__future__":[1,10],"__getattr__":1,"__html__":1,"__init__":0,"__len__":7,"__m_":1,"__m_local":9,"__name__":[0,1,10],"__nonzero__":1,"__str":9,"__str__":7,"__version__":1,"_cach":0,"_data":1,"_my_cache_work":0,"_pop_buff":1,"_pop_fram":1,"_push_buff":1,"_push_fram":1,"abstract":10,"boolean":10,"break":1,"byte":[1,9,10],"case":[0,1,2,3,5,6,7,8,9,10],"catch":1,"class":[0,1,2,5,6,7,9,10],"default":[0,1,2,3,5,6,7,8,9,10],"dr\u00f4le":9,"export":[2,5,8],"f\u00e9rotin":1,"final":[1,3,5,9],"function":[0,1,2,3,5,6,7,8,9,10],"import":[0,1,2,3,6,7,8,9,10],"int":7,"long":[1,7,8],"new":[0,1,2,3,5,7,8,10],"pla\u00eet":9,"r\u00e9veill\u00e9":9,"return":[0,1,2,3,6,7,8,9,10],"short":0,"static":[4,5],"super":[0,5,6,9],"switch":7,"throw":[0,7],"true":[0,1,2,3,6,7,8],"try":[1,3,7,8,9,10],"var":1,"while":[1,2,3,5,8,10],abil:[0,6,8,9,10],abl:7,about:[1,4],abov:[0,2,3,5,6,7,8,9,10],absolut:[1,2,9],accept:[0,1,3,6,7,8,9,10],accessor:[0,1,5,6],accommod:1,accompani:10,accomplish:[0,8,10],accord:1,accordingli:10,account:2,accountdata:2,accountnam:2,accumul:8,achiev:[2,5,7],acquir:[0,9],across:[0,7],act:[7,10],actual:[0,1,2,3,5,6,7,8,10],add:[2,3,5,10],addit:[0,1,2,3,5,6,8,10],addition:[1,5,9,10],address:[0,10],adjust:[1,6,8,10],adjust_uri:10,advanc:10,advantag:[5,6,9,10],affect:[1,7],afford:[1,10],after:[0,1,3,6,7,10],again:[2,7],against:[1,8,10],agre:5,akkerman:1,algorithm:1,all:[0,1,2,3,4,5,6],allow:[0,1,2,3,5,6,7,8,9,10],almost:[5,8],alon:1,along:[0,5,6],alor:9,alpha:1,alreadi:[1,5,7,10],also:[0,1,2,3,5,6,7,8,9,10],altern:[1,7,9,10],although:8,altogeth:1,alwai:[1,2,5,7,9],ani:[0,1,2,3,5,6,7,8,9,10],anonym:[0,1,2,8],anoth:[1,2,5,6,7,8,9,10],answer:1,anyth:[2,5,9],anywai:[1,10],anywher:[2,6,8],appar:[1,3,6],appear:[1,3,7,8,10],append:10,appli:[1,2,3,6,7,8,9,10],applic:[1,3,7,8,10],approach:[5,7,9],appropri:1,approxim:10,apr:1,aptli:10,arbitrari:[0,8],arbitrarili:[1,2],area:[2,5,7,8,9],aren:[1,2,9],arg1:6,arg2:6,arg3:6,arg4:6,arg:[0,1,2,3,6,8,10],argpars:1,arguabl:9,around:[1,3,7,10],arrai:3,arrang:8,ascii:[1,9],ask:7,aspect:[8,9],assign:[1,2,7,8,10],associ:[0,1,7],assum:[9,10],ast:[1,9],atom:10,attach:6,attempt:[0,1,9],attr:[1,5],attribut:[0,1,2,3,4],attributeerror:1,aug:1,augment:[2,4],author:7,automat:[0,2,3,5,7,8,10],avail:[0,1,2,3,5,6,7,8,9,10],avoid:1,awai:5,awar:[1,7,9,10],babel:1,babelplugin:10,back:[1,5,7,9,10],background:9,backslash:[1,8],backward:[0,1],bar:[1,2,3,6,7,8,10],bare:1,base:[0,1,3,4,5,6,7,8],basemost:5,basestr:1,basi:[0,5,7],basic:[1,2,4,6,8,9],batch:3,batcheld:1,beaker_cach:0,beakercacheimpl:0,bean:10,becam:1,becaus:[1,2,3,5,9],becom:[1,6,9,10],been:[0,1,3,6,9,10],befor:[0,1,3,5,6,8,9,10],began:7,begin:10,behav:2,behavior:[1,3,5,7,10],bell:9,below:[1,2,5,9],ben:1,benchmark:1,best:8,better:[0,1,7],between:[1,2,5,6,7],beyond:[0,2],binari:9,bit:[1,2,7,10],bitbucket:1,black:7,blank:[1,7],block:[0,1],blunt:0,board:7,bodi:[0,1,2,4,5],bold:3,bom:1,bool:7,bot:7,both:[1,2,3,5,7,9,10],bottom:1,bottommost:5,bound:1,breakag:1,breakdown:5,brief:10,broke:1,broken:1,buf:[3,10],buffer:1,buffer_filt:[1,10],buffet:1,bug:1,bugfix:1,build:[2,5,6],buildtabl:2,built:[1,2,3,4,5],builtin:[1,9],bump:1,bunch:6,burden:9,bye:2,bytestr:[1,10],bytestring_passthrough:[1,10],cache_:[0,1],cache_arg:[0,1,10],cache_dir:[0,1,10],cache_en:[0,1,10],cache_impl:[0,1,10],cache_kei:[0,1],cache_region:0,cache_timeout:[0,1,2],cache_typ:[0,1,8,10],cache_url:[0,1,10],cache_xyz:0,cacheabl:1,cacheimpl:[0,1,10],cachemanag:[0,1],calcul:10,call:[0,1],call_my_object:9,callabl:[0,1,2,3,6,7,8,10],callable_:[6,10],caller:[1,2,3,6,7],caller_stack:[1,6,9],calling_uri:6,callstack:7,came:1,camp:1,can:[0,1,2,3,5,6,7,8,9,10],cannot:[1,2,9,10],cant:1,capabl:[0,1,10],captur:[1,3,6,7,10],care:[0,6,7,9],catalog:10,categori:6,caught:10,caus:[1,3,6,7,10],cazabon:1,central:[2,3,7,8],certain:[1,3,6,9,10],cfg:[1,10],cgi:[1,3,9],chain:[1,5,6,7,8],chang:[0,1,5,7,9],chapter:[2,3,4,5],charact:[1,8,9,10],characterist:8,charl:1,check:[1,5,7,8,9],checker:7,cheetah:9,child:5,choos:9,chosen:0,clarifi:1,class_:5,classic:[6,8],clean:[0,1,10],cleaner:7,close:[1,2,6,8,10],closur:2,cmd:1,cmdline:1,code:[1,2,3,6,7,8,9,10],codebas:1,codec:[9,10],codegen:1,codi:1,coerc:9,col:2,collect:[0,1,6,7,9],collection_s:10,collis:1,colomiet:1,colon:[0,8],column:2,combin:[1,7],come:[0,2,5,8,9,10],comma:[2,3,10],command:[1,10],comment:[1,4],common:[1,4,5,6,9],commonli:[0,5,9],commun:[2,7],comp1:6,comp2:6,comp:6,compar:[9,10],compat:[0,1,6,10],compil:[0,1,7,8,10],compileexcept:1,complet:[1,5,6,10],compliant:9,compon:[0,6,7],comprehens:1,concaten:[3,10],conceiv:7,concept:[2,8,10],condit:[1,2,5,8],condition:[1,6],configur:[0,1,5,6,10],conflict:0,conform:1,confus:[5,9],conjunct:[1,5,10],consid:[1,7,10],consist:8,consol:9,conson:7,constant:7,construct:[0,1,2,5,6,8,9,10],constructor:1,consum:[0,1,8],contain:[0,1,2,6,8,9,10],content:[0,1],context:[0,1,2,3,4,5,6],contextu:2,contigu:8,continu:[1,8,9,10],contrast:[2,5,9],contrib:1,contribut:1,contriv:10,control:[1,2,3,4,5,7],convei:10,conveni:0,convent:[2,6],convers:[1,9],convert:[0,1,9,10],convert_com:1,copi:[1,6,7],core:1,correct:[1,6],correctli:[1,7],correspond:[0,5,6,7,10],corrupt:1,could:[1,5],couldn:1,count:[2,7,10],coupl:1,cours:[1,7],courtesi:1,cover:1,coverag:1,creat:[0,1,2,6,7,8,9,10],creation:[0,1,2,3,10],creation_funct:0,critic:1,crlf:1,cross:1,css:[1,6,10],cstringio:[1,9,10],ctx:10,current:[1,2,5,6,7,8,10],current_sect:8,custom:[1,2,3,5,6,8,9,10],dairiki:1,daniel:1,data:[0,1,2,6,7,9,10],databas:2,date:1,daverio:1,dbm:0,deal:[7,8,9],dealt:10,dec:1,decid:[7,8],decis:[5,7,9],declar:[1,2,3,4,5],decod:[1,3,9],decor:1,decreas:6,deepli:2,def:[0,1],default_filt:1,defin:[1,2,3,4,5,6,7,8],definit:[2,3,5,6],defnam:[1,2],deftempl:[2,10],delai:1,deliv:[1,3,6],delta:6,demarc:2,denot:8,depend:[1,4],deploy:1,deprec:[1,10],depth:7,derek:1,deriv:[0,1,3,9],describ:[1,2,3,5,6,7,8,9,10],descript:10,descriptor:1,design:3,desir:[1,6,9,10],despit:1,dessin:9,dest:10,destin:10,detail:[2,5,7,8,9,10],detect:1,determin:[0,1,9],determinist:3,develop:9,dict:[1,9],dictionari:[0,1,6,7,10],did:[1,5],differ:[0,1,2,5,6,7,10],differenti:7,dir:[0,1,10],direct:[0,2,6,8,10],directli:[0,1,2,3,6,8,10],directori:[0,1,3,7,9,10],dirnam:10,disabl:[0,1,3,4,7],disable_unicod:[1,3],disait:9,disallow:1,discard:3,discuss:1,disgard:9,displai:[1,10],disregard:10,distinct:[1,10],distinctli:5,distribut:10,distutil:10,div:[2,5,6,10],divis:10,do_something_speci:0,doc:[1,2,7],document:[0,1,5,8,9,10],doe:[1,2,5,6,7,8,9],doesn:[1,2,5,6,7],don:[0,1,2,5,7,9],done:[9,10],dot:1,doubli:1,down:[0,1,9],dragon:1,draw:3,drive:1,drop:[1,8],due:1,dumb:9,dump:[6,9],dure:[1,5,10],dyn:6,dynam:[1,5,8],each:[0,1,2,5,6,7,8,9,10],earli:[1,4],earlier:[0,9],eas:[3,7],easi:[3,7],easier:0,edgewal:1,eeve:1,effect:[0,1,2,3,6,10],egg:7,either:[0,1,5,7,8,9,10],elabor:1,elem:8,element:[1,2,5,7,8,9,10],elif:8,elimin:9,ell:9,els:[0,1,7,8,10],emac:1,email:8,emb:[6,8,9],embed:1,emit:[1,8],empti:[1,3,8,9],enabl:[0,1,7,8,10],enable_loop:[1,7,10],enclos:[2,7],encod:[1,3,4],encoding_error:[1,9,10],encount:[1,5],end:[1,3,5,8],endfor:[2,6,7,8],endif:[1,2,6,7,8],endless:1,endwith:1,enforc:1,enorm:2,ensur:[0,1,6,9],entir:[2,3,4,5,6,8],entiti:[1,3],entri:[0,1,10],entrypoint:[0,1],enumer:7,environ:[1,3,4],epoch:0,equival:[0,2,3,6,8,9],eric:1,errant:1,error:[1,2,7,9,10],error_handl:[1,10],escap:[1,2,3,4],essenti:[0,6,9],establish:[1,7,10],etc:[0,1,2,6,7,8,10],eval:1,evalu:[1,2,6,8],evaul:1,even:[1,5,7,8,9],ever:[6,9],everi:[1,6,8],everyon:7,everyth:[1,7],exactli:[2,5],examin:6,exampl:[0,1,2,3,4,5],exc:1,exc_info:[1,10],exceed:7,except:[0,1,2,3,4,6,7,8],excerpt:10,exclus:10,exec:1,execut:[0,1,2,3,5,6,7,8,10],exist:[0,1,2,6,7,8,9,10],exit:[1,4],expand:1,expect:[1,2,5,7,8,9],experienc:7,expir:[0,1],expiri:1,explcitli:1,explicit:[0,1,2,6,7,8,9],explicitli:[1,5,6,7,9,10],expr:[1,2,6],express:[1,2],expression_filt:[1,3],ext:[0,1,10],extens:1,extern:[0,2,5],extra:[1,5,8],extract:[1,10],extractor:[1,10],facad:0,facet:7,facil:5,fact:[2,5,9],fail:1,failur:7,fake:8,fall:0,fals:[0,1,7,10],familiar:[2,8],far:[1,5,8,9,10],fashion:0,fast:10,fastencodingbuff:[1,9],faster:[1,9],featur:[0,1,5,7,8,10],feb:1,few:[1,7],field:10,file:[0,1],filehandl:[1,9],filenam:[0,1,6,10],filename_to_uri:10,filesystem:[0,1,6],filesystem_check:10,filter:[1,2],find:[7,8,10],finish:5,first:[0,1,3,5,6,7,8,9,10],five:[0,8],fix:[0,1,6,10],flag:[0,1,3,6,7,8,9,10],flexibl:[3,5,8],flip:2,flow:8,fly:9,follow:[1,2,5,6,7,8,10],foo:[1,2,3,6,7,8,9,10],footer:[5,8],forc:[1,10],form:[1,2,6,8],format:[1,2,6,8,9,10],format_except:[1,10],formatt:1,former:1,forward:1,found:[1,2,7,8],four:[6,8],fragment:1,frame:1,framework:4,francoi:10,free:[1,6],freeli:7,fri:1,frobnizzl:8,from:[0,1],frozenset:1,full:[1,8,10],fulli:[1,3,5,10],func:6,further:[1,8],futur:[6,8],future_import:[1,10],futures_import:10,fyi:1,gae:1,game:9,garbag:0,gather:9,gave:10,geisler:1,gener:[0,1,2,3,5,6,7,8,9,10],genshi:8,georg:1,get:[0,1,3,5,6,7,8,9,10],get_cach:6,get_def:[1,2,3,10],get_namespac:[1,6],get_or_cr:[0,1],get_resourc:8,get_templ:[0,6,9,10],getargspec:1,getattr:6,getdefaultencod:1,gettext:[1,10],getvalu:[3,10],github:1,give:[2,6],given:[0,1,2,3,5,6,7,10],global:[0,2,5,6,7],glyph:1,goal:[1,3],goe:8,good:[0,1,8],got:1,graphic:9,great:[6,9],grei:5,group:[0,1,6],guess:[1,9],guest:1,guid:10,hack:[1,7],had:[1,9],hadn:1,haltner:1,ham:7,hand:5,handi:6,handl:[0,1,2,4,7,8],handler:[1,10],happen:[6,7,9],hard:[5,7,8,9],harland:1,has_templ:10,hasattr:6,hash:1,have:[0,1,2,3,5,6,7,8,9,10],head:[2,5,6,10],header:[0,1,2,5,8,10],heavili:9,heck:4,hello:[2,6,8,9,10],help:[0,1,9,10],helper:10,her:9,here:[0,1,3,5,6,7,8,9,10],highlight:[1,10],hit:[3,9],hold:6,home:1,honor:1,hopefulli:1,how:[1,2,6,7,8,10],howev:[1,2,5,6,9],href:[2,6],htdoc:10,html:[0,1,2,3,5,6,8,9,10],html_error_templ:[1,10],html_escap:1,htmlentitydef:3,htmlentityreplac:[1,10],http:1,hypothet:5,idea:[1,5,8],ideal:1,ident:[1,6,10],identifi:[0,1,8,10],ignor:[7,8],illus:9,illustr:[3,5,10],imag:[9,10],imaginez:9,imankulov:1,immedi:[1,5,7,8,9,10],immut:7,impl:0,implement:[0,1,2,5,10],impli:10,implic:9,implicit:[0,7],implicitli:1,improv:[1,8,9,10],incl:6,includ:[0,1,2,4],include_fil:[1,6],incom:9,incompat:1,incorrect:1,increas:10,indent:[1,8],index:[1,4,5,6,7,8,10],indic:[0,1],individu:[0,1,2,7,10],info:[1,10],inform:[1,6,8,9,10],inher:3,inherit:[0,1,2,4],initi:[1,2],inject:10,inlin:[1,5,7,8],inner:[1,2],input:[1,2,3,9],input_encod:[1,9,10],insensit:1,insert:[5,10],insid:[0,1,2,5,6,8,10],inspect:1,inspir:8,instal:[0,1],install_requir:1,instanc:[6,7,8,10],instead:[1,2,3,5,6,9,10],insur:1,integ:[0,2,9],integr:[0,1,4,5],intellig:9,intend:[1,3,6],intent:3,interact:[5,6,9],interchang:5,interest:10,interfac:0,intermedi:5,intermix:5,intern:[0,1,3,7,9,10],interpret:[1,2,9,10],interven:1,intro:2,introduc:[2,5,6,7,8],invalid:[0,1],invalidate_bodi:[0,1],invalidate_closur:[0,1],invalidate_def:[0,1],invoc:5,invok:[2,5,8,10],involv:[1,5],ioerror:1,iou:7,isn:[1,7],issu:[1,2,9,10],item:[2,7,8],iter:[2,6],itself:[0,1,2,3,5,6,7,8,9,10],jack:10,jan:1,javascript:6,jeff:1,jinja2:[1,2,8],jinja:1,jit:7,job:3,joe:8,john:2,join:9,jot:7,jour:9,json:1,jsp:8,jul:1,jun:1,just:[1,2,3,5,6,7,8,9,10],jut:7,jython:1,keep:2,kei:[0,1,5,6,7,9,10],keyerror:7,keyword:[1,2,5,6,7,8,9,10],kind:[0,3,5,6,7,8,9,10],know:[5,9],known:[1,2,6],kwarg:[0,1,6,7,10],lack:1,lai:2,lambda:1,languag:[2,8,9],larg:[1,5],last:[1,7,10],last_modifi:1,later:[0,8],latest:1,latter:[1,9],laurent:1,layout:[1,2,5,6,10],layoutdata:2,lead:[1,3,6,7],learn:9,least:[6,10],left:[3,10],leftmost:3,legaci:1,legacy_html_escap:1,legendari:1,len:8,less:[1,5,7,9],let:[1,2,5,7,10],level:[0,1,2,3,4,5,6,7],lever:9,leverag:8,lex:1,lexer:[1,8,9,10],lexer_cl:[1,10],lib:1,librari:[0,2,3,6,9,10],lieu:10,lift:5,lighter:1,like:[0,1,2,3,5,6,7,8,9,10],line:[1,5,8,9,10],lineno:10,lingua:1,link:[6,10],linkag:5,list:[0,1,2,3,5,7,8,9,10],lister:2,liter:[1,6,9,10],littl:[1,2,7,10],live:0,load:[6,8,10],load_templ:1,loader:1,local:[0,1,2,3],locals_:1,locat:[1,6,7,9,10],lock:0,logic:[1,3],long_term:0,longer:1,look:[0,1,2,5,6,7,9,10],lookup:[0,1,7,9,10],loop:[1,2,4],loopcontext:7,lopez:1,lost:1,lot:[1,8],lower:1,made:[0,1,7],magamedov:1,magic:[1,7,9],mai:[0,1,3,6,7,8,9,10],main:[1,2,3,5,6,7,9,10],mainlayout:[2,5],mainli:[1,6],maintain:[0,1,10],major:[1,7,9],mak:1,make:[0,1,2,3,5,6,7,8,9,10],mako:[0,1,2,3,4,5,6],mako_cach:0,mako_modul:10,manag:[0,1,7],manfr:1,mani:[1,7,8],manner:3,manual:10,map:[1,10],mar:1,markedli:9,marker:[1,8],markupsaf:[1,3,9],martin:1,matter:5,maxim:[0,9],maximum:1,mayb:5,mean:[0,1,2,3,5,6,7,8,9,10],meant:5,mechan:[0,5,8],member:[7,8,10],memcach:[0,1],memori:[0,1,8,10],mention:9,merg:1,mess:1,messag:[1,7,10],met:2,metadata:[1,8],metaphor:5,method:[0,1,2,3,4,5],middl:[3,5,8],might:[5,6,7,8],migrat:1,mimic:10,mini:7,minim:0,minor:10,minu:[0,1],minut:0,mirror:10,miss:[1,3,7,10],mistak:5,mix:1,mkstemp:10,mode:[1,9],model:2,moder:10,modern:[0,1],modifi:[1,2,5,9,10],modul:[0,1,2,3,4,5],module_directori:[0,1,10],module_filenam:[1,10],module_writ:[1,10],modulenam:0,modulename_cal:[1,10],modulenamespac:6,modulepath:0,moduletempl:1,moi:9,moment:10,mon:1,more:[0,1,2,3,5,6,7,8,9,10],most:[0,1,2,5,6,7,8,9,10],mostli:[0,1,6,7,10],mouton:9,move:10,msgid:10,msgstr:10,much:[1,2,5,8,9],multi:1,multibyt:[1,10],multilin:[1,8],multipl:[0,1,2,4],multithread:0,must:[0,1,2,5,6,9,10],mutual:10,my_tag:6,mycomp:0,mydef:2,myescap:3,myexpress:3,myfil:8,myfilt:[1,3],myfunc:8,myghti:9,myghtyutil:1,mylib:8,mylookup:[9,10],myn:1,mynamespac:[6,8],mypackag:3,myproj:10,mystuff:2,mystyl:6,mytag:6,mytempl:[0,1,9,10],mytmpl:10,name:[0,1],nameerror:[1,7,10],namespac:[0,1,2,3,4],namespace_nam:6,namespacenam:[1,2,8],nari:9,nativ:9,natur:3,necessarili:7,ned:1,need:[0,1,2,5,6,7,9,10],neither:0,nest:[0,1,2,3,4],nestabl:2,never:1,newer:[2,10],newli:0,newlin:[1,4],next:[0,2,3,4],nightmar:9,ninja:5,node:1,non:[1,7,8,9,10],none:[0,1,3,6,7,8,10],normal:[1,2,3,7,8,9,10],nose:1,note:[0,1,2,3,5,6,7,9,10],noth:5,notic:2,notimplementederror:10,notion:7,nov:1,now:[1,5,7,8,9],number:[0,1,2,7,8,10],numer:8,nutshel:5,object:[0,1,2,3,5,6,7,8,9,10],objnam:0,observ:1,obsolet:1,obvious:5,occlud:1,occur:[0,1,2,10],oct:1,odd:[1,7],off:[0,1,2],offer:[8,9],often:[5,6],old:[1,7],onc:[2,5,7,8],ongo:1,onli:[0,1,2,3,5,7,8,9,10],onto:[7,8],open:[5,8,9],oper:[1,2,3,6,7,8,9,10],opposit:5,opt:[0,1,10],optim:1,option:[0,1,6,7,8,9,10],optpars:1,order:[0,1,5,8,9,10],ordinari:6,org:1,organ:[5,6],orient:[2,5],origin:[0,1,3,6,7,9,10],other:[0,1],otherwis:[1,7,8,9,10],our:[0,1,2,5,10],out:[0,1,2,5,8,9,10],outer:2,output:[1,2,3,4,5,6,7,8],output_encod:[1,9,10],outputpath:10,outsid:[1,2,5,6,7,9],outward:10,over:[1,3,6,7],overhead:[1,9],overrid:[0,1,5,6,7,9,10],overridden:[0,2,5,6],overrod:5,overwritten:0,own:[0,1,2,3,5,6,7,8,9,10],pack:1,packag:[0,1,8],page:[0,1],pagearg:[1,2,6,7,9],pagecontrol:2,paradigm:5,param:8,paramet:[0,1,6,9,10],parent:[0,1,2,4],pariti:7,pars:[1,8,9,10],parseabl:1,part:[0,1,5,6,7],parti:0,partial:[1,5],particip:5,particular:[0,1,5,6,7,10],particularli:[1,6],pass:[0,1,2,5,6,7,8,9,10],pass_context:[0,1],passthru:1,patch:1,path:[0,1,6,10],pathnam:1,pattern:10,paul:1,pbj:7,penalti:1,peopl:1,pep:[1,9],per:[0,1,5,7,8,9],percent:[1,8],percentag:10,perform:[1,3,6,9,10],perhap:[2,7,8],perl:8,perm:1,perman:1,permiss:[1,10],persist:[0,1],petit:9,phase:10,philosophi:7,picki:9,pinard:10,pipe:3,pit:7,pkg_resourc:[0,1],place:[0,1,2,5,8,10],plai:[6,9],plain:[1,2,6,8,9,10],platform:10,pleas:8,plu:[1,10],plug:0,point:[0,1,2,5,6,8,9,10],polymorph:8,pop:[0,3,7],pop_buff:3,pop_cal:7,pop_fram:9,popul:0,popular:10,populate_self:6,portabl:2,portion:[1,2],posit:6,possibl:[0,2,3,7],post:[2,10],post_pros:2,pot:7,potenti:5,pow:8,power:8,practic:[1,5],pre:[1,10],preambl:10,preced:[5,6,8,9,10],precompil:1,predefin:1,prefer:[1,9],prefix:[0,1,7],prep:7,prepend:1,preprocessor:[1,10],presenc:1,present:[0,1,2,5,6,7,9,10],preserv:1,pretti:[8,9],prevent:[1,8],previou:[1,2,5,6,7,10],previous:[1,6,10],primari:10,primarili:7,print:[2,9,10],printabl:9,prior:[3,7,9],privat:1,probabl:[0,1,2,7,10],procedur:0,process:[0,1,5,8,9],produc:[1,2,3,4],product:10,program:[8,9],programat:10,programm:9,progress:7,project:10,propag:[1,7,8,10],proper:10,properli:[1,9],properti:[1,6,10],propig:1,provid:[0,1,2,3,5,6,7,8,10],proxi:6,prune:1,pull:[1,2,6,7,10],pullreq:1,pure:[1,6,8,9],purpos:[1,7,8,9,10],push:7,push_buff:3,push_cal:7,push_fram:9,put:[0,1,5,6,7],put_str:10,put_templ:10,py2:1,py2k:1,py3k:1,pybabel:10,pygment:1,pygmentplugin:10,pylon:[1,10],pypars:1,pyramid:1,pythagorean:8,python3:1,python:[1,2,3,4,5],quand:9,quick:[1,2,8],quickli:9,quot:[1,9],quote_plu:3,rais:[1,2,7,9,10],rang:[1,2,8],rather:[1,7],raw:[1,9,10],reach:[7,10],read:[7,8,9],readm:1,real:[1,8,10],realli:[1,9],ream:9,reason:[7,9],recal:5,receiv:[1,2,3,6,8],recent:10,recogn:[5,6],recommend:[1,6],recompil:[0,1,10],record:[6,8,10],recurs:1,red:7,reduc:3,reduct:1,referenc:[1,2,5,6,7],refresh:1,regard:[1,9],regardless:[1,2,5,7],regener:[1,10],regexp:1,region:[0,1],regist:[0,1],register_plugin:[0,1],regress:1,regular:[1,2,3,4,5],rel:[1,6,10],relat:[0,1,9,10],relationship:6,relativeto:10,releas:[0,1,6,8],reli:1,reload:10,remain:[1,2,7],remot:[2,6],remov:[1,6,9],render:[0,1,2,3,4],render_:7,render_bodi:[3,7,9,10],render_context:10,render_mydef:7,render_unicod:[1,9,10],reopen:1,repair:1,replac:[0,1,3,9,10],repons:6,report:[1,10],repres:[0,1,2,7,8,9,10],represent:[1,8,10],request:[0,1,6,7,10],requir:[0,1,2,6,8,9],requset:1,reserv:1,reserved_nam:1,reset:1,resolut:[5,6,10],resolv:[1,10],resourc:[1,5,10],respect:8,respons:[0,5,7],rest:[0,5,8],restrict:[1,2,5],result:[1,2,3,5,7,8,10],retriev:0,revers:10,reverse_index:7,reverse_record:10,reverse_traceback:10,revis:10,rework:1,rewrot:1,richtraceback:[1,10],right:[1,2,3,7,8,9],role:6,roman:1,root:[1,10],roughli:8,routin:10,row:2,rudiment:[0,10],rule:[1,2,5],run:[1,5,6,7,9,10],run_wsgi:[1,10],runner:[1,10],runtim:[0,1,3,4,5,6],runtimeerror:1,safe:[7,9],sai:[1,2,4,5,7],sake:3,same:[0,1,2,5,6,7,8,9,10],sampl:10,sane:2,sat:1,scaffold:6,scalar:[1,6],scenario:[1,2,5,6,7,10],scheme:[1,2,6,7,9,10],scope:[0,1,2,5,6,7,8],scott:1,script:[1,6],search:[4,10],second:[0,2,3],section:[0,1,2,5,6,7,10],sectiona:5,secur:1,see:[0,1,2,6,7,8,9,10],seem:1,segment:9,select:5,selector:1,self:[0,1,2,5],semant:[1,2,5,8],semi:0,send:[1,3,5,6,7,9,10],sens:7,sent:[1,3,6,7,8],sep:1,separ:[0,1,2,3,5,10],seri:[0,1,9,10],serious:5,serv:[8,9,10],serve_templ:10,server:[0,8,10],servic:[0,8,9],set:[0,1,3,6,7,8,9],setup:[0,1,5,10],setuptool:[0,1,10],sever:[1,6],shall:5,share:[1,2,7],sharp:2,shell:1,shop:7,short_term:0,should:[0,1,6,7,10],shouldn:7,shutil:10,side:[1,2,3,8],sidebar:2,sign:[1,8],signatur:[1,2,6],signific:[7,8],silent:[1,7],similar:[2,3,5,6,7,8,9,10],similarli:[2,9],simpl:[0,2,7,8,10],simplecacheimpl:0,simpler:1,simplest:8,simpli:[3,5],simplic:3,simplifi:1,sinc:[1,2,5,6,7,9,10],singl:[0,1,2,3,5,8,9,10],singleton:7,skip:[1,10],slain:1,slash:[1,6,8],slight:1,slightli:[6,9],slim:0,slowdown:1,slower:9,small:[1,10],smoothli:5,some:[0,1,2,3,5,6,7,8,9,10],some_cal:1,some_condit:2,some_namespac:6,some_other_directori:1,some_tag:1,some_templ:[1,10],somedata:2,somedef:[0,1,2,3,6,8],someencod:1,somefil:[1,6],somefunct:6,somekei:[0,1],somemodul:1,someobject:6,sometempl:0,someth:[2,3,9],sometim:[1,5,8],somev:[6,7],somevalu:0,somewhat:[2,3],somewher:[7,9,10],sophist:5,sound:[5,8],sourc:[1,5,8,9,10],space:[0,1,2,8],spam:7,span:[2,5],special:[0,1,3,7,8,10],specifi:[0,1,3,4,5,7],speed:[1,3,9],speedup:1,sphinx:1,src:6,stack:[1,3,7,10],stacktrac:1,stage:10,stai:[0,7],standalon:[1,10],standard:[0,1,9],start:[0,2],starttim:0,startup:1,state:[1,2,5,7,9],statement:[1,2,8,10],stdout:[1,10],step:[1,2,9,10],stick:[1,2,7,8,9],still:[1,2,5,9],stop:[7,8],stop_rend:[1,8],storag:[1,9],store:[0,1,3,7,9,10],str:[1,3,7,9,10],straight:[1,9,10],strategi:0,stream:[1,6,7,8,9,10],streamlin:5,strict:10,strict_undefin:[1,7,10],strictli:[1,9],string:[0,1,3,6,7,8,9,10],stringifi:1,stringio:[1,7,9,10],strip:[1,3],stripe:7,structur:[1,4,5,7],stuff:[6,8],style:[1,2,9],stylesheet:[6,10],sub:[2,8],subclass:[0,2,10],subcompon:2,subdef:2,subdirectori:1,subject:1,subsequ:0,substitut:[3,4,7],succe:1,success:10,suggest:1,suit:[1,5],summari:8,sun:1,supersed:[0,1],suppli:[1,6,8],support:[0,1,2,6,8,9,10],supports_cal:[1,6],suppos:[0,2],sure:[1,8],surpris:9,surround:[1,8],suspend:8,svn:1,swap:0,symbol:[1,8],synchron:1,synonym:[0,1,6],syntact:8,syntax:[1,2,3,4],system:[0,1,2,5,7,10],tabl:[1,2],tack:6,tag:[0,1,2,3,4,5,6,7],tagfilt:3,tailor:2,take:[1,2,3,5,6,8,9],taken:[0,1,6,10],target:[1,2,3],task:0,taylor:1,techniqu:7,techspot:1,tell:8,tempfil:[1,10],templat:[0,1,2,3,4],templatecollect:10,templatelookup:[0,1,3,4,6,7,9],templatelookupexcept:10,templatenam:10,templatenamespac:6,templatetext:[3,9],templateuri:6,temporari:1,temporarili:1,term:0,test:1,text:[0,1,2,3,6,7],text_error_templ:[1,10],textmat:1,textual:[3,5,10],tgplugin:1,than:[0,1,3,5,7,8,9],thank:1,thei:[1,2,3,5,7,8,9,10],them:[1,2,3,5,6,7,10],themselv:[0,2,5,6,7,8],theorem:8,therebi:6,therefor:[5,6,8,10],thereof:1,thi:[0,1,2,3,5,6,7,8,9,10],thing:[1,2,5,7,8,9],think:7,third:0,those:[0,1,2,6,7,8,10],though:[0,1,5,7,9],thread:0,threadsaf:0,three:[7,8],through:[1,6,7,9,10],throughout:[1,6],thrown:[0,10],thu:[1,10],time:[0,1,2,3,4],timeout:[0,1],timestamp:0,tinker:1,titl:[2,5,8],tmbundl:1,tmp:[3,10],togeth:[5,6],token:1,too:[1,3,5],tool:[0,1],toolbar:[5,8],top:[0,1,2,3,5,6,7],toplevellookupexcept:1,toplevelnotfound:10,topmost:[5,6,7,8],torborg:1,toscawidget:1,touch:1,toward:[2,5],trace:[1,10],traceback:[1,10],tracelin:10,track:[1,7],trail:3,transform:3,transit:7,translat:[1,10],transpar:7,travers:6,treat:[1,9],treatment:9,tri:[2,7,10],trim:[1,3,8],trofatt:1,tryexcept:1,tue:1,tupl:[1,10],turbogear:1,turn:1,twist:2,two:[0,1,2,3,5],txt:[8,9,10],type:[0,1,2,6,7,8,9,10],typeerror:[1,7],typic:[0,10],ultim:[1,5,6],umask:1,unbound:10,unbuff:3,unclos:1,uncommon:1,uncondition:9,undeclar:[1,10],undefin:[1,2,7,8,10],under:[0,1,9,10],underli:[0,2,3,5,6,7,8,10],underneath:0,underscor:1,understand:[5,9],understood:0,unescap:1,unexplain:1,unicod:[1,3,4],uniniti:7,uniqu:[0,5,7],unit:1,univers:1,unknown:1,unless:[7,9],unlik:9,unreach:2,until:[1,10],unusu:10,updat:[1,10],upon:[0,1,2,3,5,10],uri:[1,6,8,10],url:[0,1,3,8,10],urllib:3,usabl:2,usag:[0,1,2,3,4,5],use_pag:3,user:[1,7,8,9,10],userbas:9,usernam:[2,8],usual:[0,1,3,7,8,10],utf8:[3,9],utf:[1,3,9,10],util:10,valid:8,valu:[0,1,2,3,6,7,8,9,10],variabl:[1,2,5,6],variant:[1,8],varieti:[0,6,8],variou:[1,3,6,7,8,9,10],vast:9,veri:[0,1,2,5,10],version:0,versu:[1,6,10],via:[0,1,2,5,6,7,8,9,10],view:10,vincent:1,vladimir:1,voix:9,vou:9,vowel:7,wai:[0,1,2,3,4,5],walkthrough:2,want:[0,2,3,5,6,7,8,9],warn:1,wasn:[1,5,7],web:10,wed:1,weight:1,welcom:1,well:[0,1,2,3,5,6,7,8,9,10],were:[1,5,6,7,9],what:[1,2,4],whatev:[1,6,7,9,10],whatsoev:[1,9],wheel:1,when:[0,1,2,3,5,6,7,8,9,10],whenev:[5,9,10],where:[0,1,2,3,5,6,7,8,9,10],wherea:[2,7,8,9],wherebi:1,wherev:9,whether:[1,3,7,8],which:[0,1,2,3,5,6,7,8,9,10],white:[1,5],whitespac:[1,2,3,8],who:[1,9],whole:[2,3,5,6],whoop:1,why:7,wichert:1,widget:2,window:1,wise:1,wish:[0,3,7],within:[0,1],without:[0,1,5,6,7],won:[5,7,10],wonder:8,word:5,work:[0,1,2,3,5,6,7,9,10],world:[2,6,7,8,9,10],woroshow:1,would:[0,1,2,3,5,7,9,10],wouldn:[6,8],wrap:[1,2,4],wrapper:3,writer:7,written:[1,5,8,10],wsgi:1,wsgiutil:10,x80:9,x99a:9,xa9:9,xa9veil:9,xb4le:9,xc3:9,xe2:9,xie:1,xml:[1,3,8,10],year:1,yet:[0,1,6],ymmv:1,you:[0,1,2,3,5,6,7,8,9,10],your:[1,2,3,5,6,7,8],yourself:[9,10],zebra:7,zer0:1,zero:1,zzzeek:1},titles:["Caching","Changelog","Defs and Blocks","Filtering and Buffering","Table of Contents","Inheritance","Namespaces","The Mako Runtime Environment","Syntax","The Unicode Chapter","Usage"],titleterms:{"static":6,"true":9,about:5,access:0,accessor:7,all:7,api:[0,6,7,10],argument:[0,2,3],attr:6,attribut:5,augment:5,babel:10,backend:0,base:10,basic:10,beaker:0,block:[2,3,5,8],bodi:6,buffer:[3,7,9],built:[6,7],cach:0,call:[2,6,8],changelog:1,chapter:9,check:10,collect:10,comment:8,common:10,content:[2,4,5],context:[7,8],control:8,cycl:7,declar:6,decor:3,def:[2,3,5,6,8],default_filt:3,defin:9,defnam:8,depend:6,disabl:9,disable_unicod:9,doc:8,dogpil:0,earli:8,embed:2,encod:[9,10],entir:9,environ:7,escap:8,exampl:6,except:10,exit:8,express:[3,8,9],file:[2,9,10],filesystem:10,filter:[3,8],framework:10,from:[2,6,8],guidelin:0,handl:[9,10],heck:9,includ:[5,8],indic:4,inherit:[5,6,8],integr:10,iter:7,legaci:7,level:8,local:6,loop:[7,8],mako:7,method:[6,7],migrat:7,modul:[6,8],multipl:5,name:[2,5,6,7],namespac:[5,6,8],nest:5,newlin:8,next:5,nsname:8,off:3,older:1,other:2,output:9,page:[2,8],parent:[5,7],plugin:0,produc:5,programmat:[0,2],pygment:10,python:[6,8],refer:[0,6,7,10],regular:6,render:5,reserv:7,rule:9,runtim:7,sai:9,select:9,self:6,set:10,size:10,specif:[0,6],specifi:9,structur:8,substitut:8,syntax:8,tabl:4,tag:8,templat:[5,7,8,9,10],templatelookup:10,text:8,time:5,turn:3,two:6,unicod:[9,10],usag:[6,9,10],variabl:7,version:[1,6],wai:6,what:5,within:2,word:7,wrap:5,write:0,wsgi:10}}) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/syntax.html new/Mako-1.0.3/doc/syntax.html --- old/Mako-1.0.2/doc/syntax.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/syntax.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Syntax — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Defs and Blocks" href="defs.html" /> <link rel="prev" title="Usage" href="usage.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Syntax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/unicode.html new/Mako-1.0.3/doc/unicode.html --- old/Mako-1.0.2/doc/unicode.html 2015-08-26 20:02:58.000000000 +0200 +++ new/Mako-1.0.3/doc/unicode.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ The Unicode Chapter — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Caching" href="caching.html" /> <link rel="prev" title="Filtering and Buffering" href="filtering.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » The Unicode Chapter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/doc/usage.html new/Mako-1.0.3/doc/usage.html --- old/Mako-1.0.2/doc/usage.html 2015-08-26 20:02:59.000000000 +0200 +++ new/Mako-1.0.3/doc/usage.html 2015-10-27 17:38:32.000000000 +0100 @@ -6,7 +6,7 @@ Usage — - Mako 1.0.2 Documentation + Mako 1.0.3 Documentation </title>  @@ -24,7 +24,7 @@ <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: './', - VERSION: '1.0.2', + VERSION: '1.0.3', COLLAPSE_MODINDEX: false, FILE_SUFFIX: '.html' }; @@ -34,7 +34,7 @@ <script type="text/javascript" src="_static/doctools.js"></script> <link rel="index" title="Index" href="genindex.html" /> <link rel="search" title="Search" href="search.html" /> - <link rel="top" title="Mako 1.0.2 Documentation" href="index.html" /> + <link rel="top" title="Mako 1.0.3 Documentation" href="index.html" /> <link rel="next" title="Syntax" href="syntax.html" /> <link rel="prev" title="Table of Contents" href="index.html" /> @@ -72,7 +72,7 @@ <div id="docs-header"> - <h1>Mako 1.0.2 Documentation</h1> + <h1>Mako 1.0.3 Documentation</h1> <div id="docs-search"> Search: @@ -84,7 +84,7 @@ </div> <div id="docs-version-header"> - Release: <span class="version-num">1.0.2</span> + Release: <span class="version-num">1.0.3</span> </div> @@ -109,7 +109,7 @@ </div> <div id="docs-navigation-banner"> - <a href="index.html">Mako 1.0.2 Documentation</a> + <a href="index.html">Mako 1.0.3 Documentation</a> » Usage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/mako/__init__.py new/Mako-1.0.3/mako/__init__.py --- old/Mako-1.0.2/mako/__init__.py 2015-08-26 20:01:53.000000000 +0200 +++ new/Mako-1.0.3/mako/__init__.py 2015-10-27 17:37:46.000000000 +0100 @@ -5,4 +5,4 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php -__version__ = '1.0.2' +__version__ = '1.0.3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/mako/ext/extract.py new/Mako-1.0.3/mako/ext/extract.py --- old/Mako-1.0.2/mako/ext/extract.py 2015-08-26 20:01:53.000000000 +0200 +++ new/Mako-1.0.3/mako/ext/extract.py 2015-10-27 17:37:46.000000000 +0100 @@ -16,6 +16,7 @@ def extract_nodes(self, nodes): translator_comments = [] in_translator_comments = False + input_encoding = self.config['encoding'] or 'ascii' comment_tags = list( filter(None, re.split(r'\s+', self.config['comment-tags']))) @@ -76,13 +77,18 @@ comment[1] for comment in translator_comments] if isinstance(code, compat.text_type): - code = code.encode('ascii', 'backslashreplace') + code = code.encode(input_encoding, 'backslashreplace') used_translator_comments = False - code = compat.byte_buffer(code) + # We add extra newline to work around a pybabel bug + # (see python-babel/babel#274, parse_encoding dies if the first + # input string of the input is non-ascii) + # Also, because we added it, we have to subtract one from + # node.lineno + code = compat.byte_buffer(compat.b('\n') + code) for message in self.process_python( - code, node.lineno, translator_strings): + code, node.lineno - 1, translator_strings): yield message used_translator_comments = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/mako/lookup.py new/Mako-1.0.3/mako/lookup.py --- old/Mako-1.0.2/mako/lookup.py 2015-08-26 20:01:53.000000000 +0200 +++ new/Mako-1.0.3/mako/lookup.py 2015-10-27 17:37:46.000000000 +0100 @@ -248,6 +248,9 @@ except KeyError: u = re.sub(r'^\/+', '', uri) for dir in self.directories: + # make sure the path seperators are posix - os.altsep is empty + # on POSIX and cannot be used. + dir = dir.replace(os.path.sep, posixpath.sep) srcfile = posixpath.normpath(posixpath.join(dir, u)) if os.path.isfile(srcfile): return self._load(srcfile, uri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/test/ext/test_babelplugin.py new/Mako-1.0.3/test/ext/test_babelplugin.py --- old/Mako-1.0.2/test/ext/test_babelplugin.py 2015-08-26 20:01:53.000000000 +0200 +++ new/Mako-1.0.3/test/ext/test_babelplugin.py 2015-10-27 17:37:46.000000000 +0100 @@ -6,11 +6,10 @@ try: import babel.messages.extract as babel -except: - babel = None - -if babel is not None: from mako.ext.babelplugin import extract + +except ImportError: + babel = None def skip(): @@ -79,3 +78,16 @@ (99, '_', 'No action at a distance.', []), ] self.assertEqual(expected, messages) + + @skip() + def test_extract_utf8(self): + mako_tmpl = open(os.path.join(template_base, 'gettext_utf8.mako'), 'rb') + message = next(extract(mako_tmpl, set(['_', None]), [], {'encoding': 'utf-8'})) + assert message == (1, '_', u'K\xf6ln', []) + + @skip() + def test_extract_cp1251(self): + mako_tmpl = open(os.path.join(template_base, 'gettext_cp1251.mako'), 'rb') + message = next(extract(mako_tmpl, set(['_', None]), [], {'encoding': 'cp1251'})) + # "test" in Rusian. File encoding is cp1251 (aka "windows-1251") + assert message == (1, '_', u'\u0442\u0435\u0441\u0442', []) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/test/templates/gettext_cp1251.mako new/Mako-1.0.3/test/templates/gettext_cp1251.mako --- old/Mako-1.0.2/test/templates/gettext_cp1251.mako 1970-01-01 01:00:00.000000000 +0100 +++ new/Mako-1.0.3/test/templates/gettext_cp1251.mako 2015-10-27 17:37:46.000000000 +0100 @@ -0,0 +1 @@ +${_("��")} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mako-1.0.2/test/templates/gettext_utf8.mako new/Mako-1.0.3/test/templates/gettext_utf8.mako --- old/Mako-1.0.2/test/templates/gettext_utf8.mako 1970-01-01 01:00:00.000000000 +0100 +++ new/Mako-1.0.3/test/templates/gettext_utf8.mako 2015-10-27 17:37:46.000000000 +0100 @@ -0,0 +1 @@ +${_("Köln")}

1 0