937bec9 · typeable/pandoc

git.iko.soy/typeable/pandoc

Removed old-locale flag and Text.Pandoc.Compat.Time.

This is no longer necessary since we no longer support ghc 7.8.

commit937bec95a970dfef2c7623561b4d0892399523dc authorJohn MacFarlane <jgm@berkeley.edu> dateSun 18 Mar 2018, 11:24 (9 years ago) parent7e389cb

12 files changed+12−68

compare with master

unifiedsplit

pandoc.cabal+1−15 src/Text/Pandoc/Class.hs+2−2 src/Text/Pandoc/Compat/Time.hs−30 src/Text/Pandoc/Readers/Txt2Tags.hs+1−1 src/Text/Pandoc/Shared.hs+2−7 src/Text/Pandoc/Writers/Docx.hs+1−1 src/Text/Pandoc/Writers/EPUB.hs+1−1 src/Text/Pandoc/Writers/OPML.hs+2−7 src/Text/Pandoc/Writers/Powerpoint/Output.hs+1−1 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+1−1 stack.lts9.yaml−1 stack.yaml−1

pandoc.cabal+1−15

@@ -343,10 +343,6 @@ flag network-uri

343343 Description: Get Network.URI from the network-uri package

344344 Default: True

345345

346−flag old-locale

347− Description: Use old-locale and time < 1.5

348− Default: False

349−

350346custom-setup

351347 setup-depends: base, Cabal

352348

@@ -363,6 +359,7 @@ library

363359 directory >= 1 && < 1.4,

364360 bytestring >= 0.9 && < 0.11,

365361 text >= 0.11 && < 1.3,

362+ time >= 1.5 && < 1.10,

366363 safe >= 0.3 && < 0.4,

367364 zip-archive >= 0.2.3.4 && < 0.4,

368365 HTTP >= 4000.0.5 && < 4000.4,

@@ -408,11 +405,6 @@ library

408405 cpp-options: -D_WINDOWS

409406 else

410407 build-depends: unix >= 2.4 && < 2.8

411− if flag(old-locale)

412− build-depends: old-locale >= 1 && < 1.1,

413− time >= 1.2 && < 1.5

414− else

415− build-depends: time >= 1.5 && < 1.10

416408 if flag(network-uri)

417409 build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6

418410 else

@@ -556,7 +548,6 @@ library

556548 Text.Pandoc.UUID,

557549 Text.Pandoc.Translations,

558550 Text.Pandoc.Slides,

559− Text.Pandoc.Compat.Time,

560551 Paths_pandoc

561552

562553 buildable: True

@@ -652,11 +643,6 @@ test-suite test-pandoc

652643 hs-source-dirs: prelude

653644 other-modules: Prelude

654645 build-depends: base-compat >= 0.9

655− if flag(old-locale)

656− build-depends: old-locale >= 1 && < 1.1,

657− time >= 1.2 && < 1.5

658− else

659− build-depends: time >= 1.5 && < 1.10

660646 other-modules: Tests.Old

661647 Tests.Command

662648 Tests.Helpers

src/Text/Pandoc/Class.hs+2−2

@@ -108,10 +108,10 @@ import Data.List (stripPrefix)

108108import qualified Data.Unique as IO (newUnique)

109109import qualified Text.Pandoc.UTF8 as UTF8

110110import qualified System.Directory as Directory

111−import Text.Pandoc.Compat.Time (UTCTime)

111+import Data.Time (UTCTime)

112112import Text.Pandoc.Logging

113113import Text.Parsec (ParsecT, getPosition, sourceLine, sourceName)

114−import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime)

114+import qualified Data.Time as IO (getCurrentTime)

115115import Text.Pandoc.MIME (MimeType, getMimeType, extensionFromMimeType)

116116import Text.Pandoc.Definition

117117import Data.Digest.Pure.SHA (sha1, showDigest)

src/Text/Pandoc/Compat/Time.hsdeleted−30

@@ -1,30 +0,0 @@

1−{-# LANGUAGE CPP #-}

2−

3−{-

4−This compatibility module is needed because, in time 1.5, the

5−`defaultTimeLocale` function was moved from System.Locale (in the

6−old-locale library) into Data.Time.

7−

8−We support both behaviors because time 1.4 is a boot library for GHC

9−7.8. time 1.5 is a boot library for GHC 7.10.

10−

11−When support is dropped for GHC 7.8, this module may be obsoleted.

12−-}

13−

14−#if MIN_VERSION_time(1,5,0)

15−module Text.Pandoc.Compat.Time (

16− module Data.Time

17−)

18−where

19−import Data.Time

20−

21−#else

22−module Text.Pandoc.Compat.Time (

23− module Data.Time,

24− defaultTimeLocale

25−)

26−where

27−import Data.Time

28−import System.Locale ( defaultTimeLocale )

29−

30−#endif

src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

@@ -47,7 +47,7 @@ import Text.Pandoc.Builder (Blocks, Inlines, trimInlines)

4747import qualified Text.Pandoc.Builder as B

4848import Text.Pandoc.Class (PandocMonad)

4949import qualified Text.Pandoc.Class as P

50−import Text.Pandoc.Compat.Time (defaultTimeLocale)

50+import Data.Time (defaultTimeLocale)

5151import Text.Pandoc.Definition

5252import Text.Pandoc.Options

5353import Text.Pandoc.Parsing hiding (space, spaces, uri)

src/Text/Pandoc/Shared.hs+2−7

@@ -127,7 +127,7 @@ import Text.HTML.TagSoup (RenderOptions (..), Tag (..), renderOptions,

127127 renderTagsOptions)

128128import Text.Pandoc.Builder (Blocks, Inlines, ToMetaValue (..))

129129import qualified Text.Pandoc.Builder as B

130−import Text.Pandoc.Compat.Time

130+import Data.Time

131131import Text.Pandoc.Definition

132132import Text.Pandoc.Generic (bottomUp)

133133import Text.Pandoc.Pretty (charWidth)

@@ -287,12 +287,7 @@ normalizeDate s = fmap (formatTime defaultTimeLocale "%F")

287287 where rejectBadYear day = case toGregorian day of

288288 (y, _, _) | y >= 1601 && y <= 9999 -> Just day

289289 _ -> Nothing

290− parsetimeWith =

291−#if MIN_VERSION_time(1,5,0)

292− parseTimeM True defaultTimeLocale

293−#else

294− parseTime defaultTimeLocale

295−#endif

290+ parsetimeWith = parseTimeM True defaultTimeLocale

296291 formats = ["%x","%m/%d/%Y", "%D","%F", "%d %b %Y",

297292 "%e %B %Y", "%b. %e, %Y", "%B %e, %Y",

298293 "%Y%m%d", "%Y%m", "%Y"]

src/Text/Pandoc/Writers/Docx.hs+1−1

@@ -53,7 +53,7 @@ import System.Random (randomR, StdGen, mkStdGen)

5353import Text.Pandoc.BCP47 (getLang, renderLang)

5454import Text.Pandoc.Class (PandocMonad, report, toLang)

5555import qualified Text.Pandoc.Class as P

56−import Text.Pandoc.Compat.Time

56+import Data.Time

5757import Text.Pandoc.Definition

5858import Text.Pandoc.Generic

5959import Text.Pandoc.Highlighting (highlight)

src/Text/Pandoc/Writers/EPUB.hs+1−1

@@ -55,7 +55,7 @@ import Text.HTML.TagSoup (Tag (TagOpen), fromAttrib, parseTags)

5555import Text.Pandoc.Builder (fromList, setMeta)

5656import Text.Pandoc.Class (PandocMonad, report)

5757import qualified Text.Pandoc.Class as P

58−import Text.Pandoc.Compat.Time

58+import Data.Time

5959import Text.Pandoc.Definition

6060import Text.Pandoc.Error

6161import Text.Pandoc.Logging

src/Text/Pandoc/Writers/OPML.hs+2−7

@@ -36,7 +36,7 @@ import Data.Text (Text, unpack)

3636import qualified Data.Text as T

3737import qualified Text.Pandoc.Builder as B

3838import Text.Pandoc.Class (PandocMonad)

39−import Text.Pandoc.Compat.Time

39+import Data.Time

4040import Text.Pandoc.Definition

4141import Text.Pandoc.Error

4242import Text.Pandoc.Options

@@ -77,12 +77,7 @@ showDateTimeRFC822 = formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"

7777

7878convertDate :: [Inline] -> String

7979convertDate ils = maybe "" showDateTimeRFC822 $

80−#if MIN_VERSION_time(1,5,0)

81− parseTimeM True

82−#else

83− parseTime

84−#endif

85− defaultTimeLocale "%F" =<< normalizeDate (stringify ils)

80+ parseTimeM True defaultTimeLocale "%F" =<< normalizeDate (stringify ils)

8681

8782-- | Convert an Element to OPML.

8883elementToOPML :: PandocMonad m => WriterOptions -> Element -> m Doc

src/Text/Pandoc/Writers/Powerpoint/Output.hs+1−1

@@ -43,7 +43,7 @@ import Codec.Archive.Zip

4343import Data.Char (toUpper)

4444import Data.List (intercalate, stripPrefix, nub, union, isPrefixOf, intersperse)

4545import Data.Default

46−import Text.Pandoc.Compat.Time (formatTime, defaultTimeLocale)

46+import Data.Time (formatTime, defaultTimeLocale)

4747import Data.Time.Clock (UTCTime)

4848import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime)

4949import System.FilePath.Posix (splitDirectories, splitExtension, takeExtension)

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+1−1

@@ -69,7 +69,7 @@ import Text.Pandoc.Slides (getSlideLevel)

6969import Text.Pandoc.Options

7070import Text.Pandoc.Logging

7171import Text.Pandoc.Walk

72−import Text.Pandoc.Compat.Time (UTCTime)

72+import Data.Time (UTCTime)

7373import qualified Text.Pandoc.Shared as Shared -- so we don't overlap "Element"

7474import Text.Pandoc.Writers.Shared (metaValueToInlines)

7575import qualified Data.Map as M

stack.lts9.yaml−1

@@ -2,7 +2,6 @@ flags:

22 pandoc:

33 trypandoc: false

44 embed_data_files: true

5− old-locale: false

65 network-uri: true

76 pandoc-citeproc:

87 bibutils: true

stack.yaml−1